From ad8b4f56b5ec1e5385156c20d95649ea8cee6af4 Mon Sep 17 00:00:00 2001 From: Matthias Lederhofer Date: Thu, 13 Jul 2006 12:02:29 +0200 Subject: daemon: use a custom die routine with syslog Removed the git-daemon prefix from die() because no other call to die does this. Signed-off-by: Matthias Lederhofer Signed-off-by: Junio C Hamano --- daemon.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'daemon.c') diff --git a/daemon.c b/daemon.c index e096bd7ef6..a7636bc50c 100644 --- a/daemon.c +++ b/daemon.c @@ -95,6 +95,12 @@ static void loginfo(const char *err, ...) va_end(params); } +static void NORETURN daemon_die(const char *err, va_list params) +{ + logreport(LOG_ERR, err, params); + exit(1); +} + static int avoid_alias(char *p) { int sl, ndot; @@ -746,17 +752,14 @@ int main(int argc, char **argv) usage(daemon_usage); } - if (log_syslog) + if (log_syslog) { openlog("git-daemon", 0, LOG_DAEMON); - - if (strict_paths && (!ok_paths || !*ok_paths)) { - if (!inetd_mode) - die("git-daemon: option --strict-paths requires a whitelist"); - - logerror("option --strict-paths requires a whitelist"); - exit (1); + set_die_routine(daemon_die); } + if (strict_paths && (!ok_paths || !*ok_paths)) + die("option --strict-paths requires a whitelist"); + if (inetd_mode) { struct sockaddr_storage ss; struct sockaddr *peer = (struct sockaddr *)&ss; -- cgit v1.2.3