From 5b56ea181649793918779dd2684c671072ce4bc9 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 9 Aug 2009 17:19:18 +0000 Subject: Sync OpenBSD patchset 225: If there is an error in the configuration file, don't just exit(1) as this can cause the client to hang. Instead, send the error message, then mark the client as bad and start a normal shutdown so the server exits once the error is written. This also allows some code duplicating daemon(3) to be trimmed and logging to begin earlier. Prompted by Theo noticing the behaviour on error wasn't documented. --- tmux.1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tmux.1') diff --git a/tmux.1 b/tmux.1 index ac4ec273..89ce74cb 100644 --- a/tmux.1 +++ b/tmux.1 @@ -1,4 +1,4 @@ -.\" $Id: tmux.1,v 1.142 2009-08-09 16:59:35 tcunha Exp $ +.\" $Id: tmux.1,v 1.143 2009-08-09 17:19:18 tcunha Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott .\" @@ -120,6 +120,10 @@ if present, then looks for a user configuration file at The configuration file is a set of .Nm commands which are executed in sequence when the server is first started. +.Pp +If a command in the configuration file fails, +.Nm +will report an error and exit without executing further commands. .It Fl L Ar socket-name .Nm stores the server socket in a directory under -- cgit