From: Andreas Ericsson <exon@op5.se>
Date: Mon, 14 Nov 2005 16:41:01 +0000 (+0100)
Subject: git-daemon: --inetd implies --syslog
X-Git-Tag: v0.99.9k~3^2~30
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=bce8230d5d897a738cc004954df71f50a40295db;p=git.git

git-daemon: --inetd implies --syslog

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

Signed-off-by: Andreas Ericsson <ae@op5.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt
index 67c5f22a..37838583 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 c3f86410..e1847522 100644
--- 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);
 }