From: Erik Faye-Lund <kusmabite@gmail.com>
To: git@vger.kernel.org
Cc: msysgit@googlegroups.com, j6t@kdbg.org, avarab@gmail.com,
sunshine@sunshineco.com, jrnieder@gmail.com,
schwab@linux-m68k.org, patthoyts@gmail.com
Subject: [PATCH 14/15] daemon: make --inetd and --detcach incompatible
Date: Fri, 22 Oct 2010 02:05:43 +0200 [thread overview]
Message-ID: <1287705944-5668-14-git-send-email-kusmabite@gmail.com> (raw)
In-Reply-To: <1287705944-5668-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 <kusmabite@gmail.com>
---
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 685aa58..053ded5 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=host_or_ipaddr::
Listen on a specific IP address or hostname. IP addresses can
diff --git a/daemon.c b/daemon.c
index af13f4a..fc55367 100644
--- a/daemon.c
+++ b/daemon.c
@@ -23,10 +23,10 @@ static const char daemon_usage[] =
" [--strict-paths] [--base-path=path] [--base-path-relaxed]\n"
" [--user-path | --user-path=path]\n"
" [--interpolated-path=path]\n"
-" [--reuseaddr] [--detach] [--pid-file=file]\n"
+" [--reuseaddr] [--pid-file=file]\n"
" [--[enable|disable|allow-override|forbid-override]=service]\n"
" [--inetd | [--listen=host_or_ipaddr] [--port=n]\n"
-" [--user=user [--group=group]]\n"
+" [--detach] [--user=user [--group=group]]\n"
" [directory...]";
/* 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.1.199.g72340
next prev parent reply other threads:[~2010-10-22 0:07 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-22 0:05 [PATCH 01/15] mingw: implement syslog Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 02/15] compat: add inet_pton and inet_ntop prototypes Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 03/15] inet_ntop: fix a couple of old-style decls Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 04/15] mingw: use real pid Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 05/15] mingw: support waitpid with pid > 0 and WNOHANG Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 06/15] mingw: add kill emulation Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 07/15] daemon: use run-command api for async serving Erik Faye-Lund
2010-10-22 0:10 ` Jonathan Nieder
2010-10-22 0:20 ` Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 08/15] daemon: use full buffered mode for stderr Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 09/15] Improve the mingw getaddrinfo stub to handle more use cases Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 10/15] daemon: get remote host address from root-process Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 11/15] mingw: import poll-emulation from gnulib Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 12/15] mingw: use " Erik Faye-Lund
2010-10-22 0:05 ` [PATCH 13/15] daemon: use socklen_t Erik Faye-Lund
2010-10-22 0:05 ` Erik Faye-Lund [this message]
2010-10-22 0:05 ` [PATCH 15/15] daemon: opt-out on features that require posix Erik Faye-Lund
2010-10-22 0:13 ` [PATCH 01/15] mingw: implement syslog Erik Faye-Lund
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1287705944-5668-14-git-send-email-kusmabite@gmail.com \
--to=kusmabite@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.org \
--cc=jrnieder@gmail.com \
--cc=msysgit@googlegroups.com \
--cc=patthoyts@gmail.com \
--cc=schwab@linux-m68k.org \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).