THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

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 <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
tags/v1.4.2-rc1
Matthias Lederhofer Junio C Hamano 13 years ago
parent
commit
ad8b4f56b5
1 changed files with 11 additions and 8 deletions
  1. +11
    -8
      daemon.c

+ 11
- 8
daemon.c View File

@@ -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;


Loading…
Cancel
Save