[PATCH] git-daemon: --inetd implies --syslog

From

Andreas Ericsson <exon@op5.se>

Date

Nov 14, 2005, 16:41 UTC

Message-ID

<20051114164101.58A495BF92@nox.op5.se>

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

Signed-off-by: Andreas Ericsson <ae@op5.se>

---

 Documentation/git-daemon.txt |    2 +-
 daemon.c                     |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 67c5f22..3783858 100644
--- 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 c3f8641..50a3396 100644
--- a/daemon.c
+++ b/daemon.c
@@ -627,9 +627,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);
 }
---
0.99.9.GIT