From: Erik Faye-Lund Date: Wed, 03 Nov 2010 16:31:33 GMT Subject: [PATCH v6 15/16] daemon: make --inetd and --detach incompatible Message-ID: <1288801894-1168-16-git-send-email-kusmabite@gmail.com> In-Reply-To: <1288801894-1168-1-git-send-email-kusmabite@gmail.com> Since --inetd makes main return with the result of execute() before daemonize is gets called, these two options are already incompatible. Document it, and add an error if attempted. Signed-off-by: Erik Faye-Lund --- Documentation/git-daemon.txt | 3 ++- daemon.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 5054f79..d15cb6a 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -78,7 +78,8 @@ OPTIONS --inetd:: Have the server run as an inetd service. Implies --syslog. - Incompatible with --port, --listen, --user and --group options. + Incompatible with --detach, --port, --listen, --user and --group + options. --listen=:: Listen on a specific IP address or hostname. IP addresses can diff --git a/daemon.c b/daemon.c index 5b30a2e..485bec5 100644 --- a/daemon.c +++ b/daemon.c @@ -23,10 +23,10 @@ static const char daemon_usage[] = " [--strict-paths] [--base-path=] [--base-path-relaxed]\n" " [--user-path | --user-path=]\n" " [--interpolated-path=]\n" -" [--reuseaddr] [--detach] [--pid-file=]\n" +" [--reuseaddr] [--pid-file=]\n" " [--(enable|disable|allow-override|forbid-override)=]\n" " [--inetd | [--listen=] [--port=]\n" -" [--user= [--group=]]\n" +" [--detach] [--user= [--group=]]\n" " [...]"; /* List of acceptable pathname prefixes */ @@ -1122,8 +1122,8 @@ int main(int argc, char **argv) /* avoid splitting a message in the middle */ setvbuf(stderr, NULL, _IOFBF, 4096); - if (inetd_mode && (group_name || user_name)) - die("--user and --group are incompatible with --inetd"); + if (inetd_mode && (detach || group_name || user_name)) + die("--detach, --user and --group are incompatible with --inetd"); if (inetd_mode && (listen_port || (listen_addr.nr > 0))) die("--listen= and --port= are incompatible with --inetd"); -- 1.7.3.2.161.gd6e00