git-daemon: --inetd implies --syslog

Otherwise nothing is logged anywhere, which is a Bad Thing.

Signed-off-by: Andreas Ericsson <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 67c5f22a7d8179e18be9f0e7cac59866ee5dd530..3783858302018bf9d5afa4336a9fea95b3120167 100644 (file)
--- a/Documentation/git-daemon.txt
+++ b/Documentation/git-daemon.txt
@@ -35,7 +35,7 @@ OPTIONS
        do not have the 'git-daemon-export-ok' file.
 
 --inetd::
-       Have the server run as an inetd service.
+       Have the server run as an inetd service. Implies --syslog.
 
 --port::
        Listen on an alternative port.

diff --git a/daemon.c b/daemon.c
index c3f86410d4fe392a2ced76b09e6af8ba8af534d5..e18475229885d28b39970f9619d0e89d66a8199b 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -628,8 +628,9 @@ int main(int argc, char **argv)
 
        if (inetd_mode) {
                fclose(stderr); //FIXME: workaround
+               log_syslog = 1;
                return execute();
-       } else {
-               return serve(port);
        }
+
+       return serve(port);
 }