kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'js/maint-daemon' into maint 

* js/maint-daemon:
  daemon: ensure that base-path is an existing directory
  daemon: send more error messages to the syslog
maint
Junio C Hamano 2008-03-08 02:20:30 -08:00
parent 274d9d3294 2063207156
commit 1f1300b4f1
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
daemon.c
View File

@ -1149,6 +1149,11 @@ int main(int argc, char **argv)
usage(daemon_usage); usage(daemon_usage);
} }


if (log_syslog) {
openlog("git-daemon", 0, LOG_DAEMON);
set_die_routine(daemon_die);
}

if (inetd_mode && (group_name || user_name)) if (inetd_mode && (group_name || user_name))
die("--user and --group are incompatible with --inetd"); die("--user and --group are incompatible with --inetd");


@ -1176,14 +1181,17 @@ int main(int argc, char **argv)
} }
} }


if (log_syslog) {
openlog("git-daemon", 0, LOG_DAEMON);
set_die_routine(daemon_die);
}

if (strict_paths && (!ok_paths || !*ok_paths)) if (strict_paths && (!ok_paths || !*ok_paths))
die("option --strict-paths requires a whitelist"); die("option --strict-paths requires a whitelist");


if (base_path) {
struct stat st;

if (stat(base_path, &st) || !S_ISDIR(st.st_mode))
die("base-path '%s' does not exist or "
"is not a directory", base_path);
}

if (inetd_mode) { if (inetd_mode) {
struct sockaddr_storage ss; struct sockaddr_storage ss;
struct sockaddr *peer = (struct sockaddr *)&ss; struct sockaddr *peer = (struct sockaddr *)&ss;