yann@1201: Original patch from: gentoo/src/patchsets/glibc/2.9/1160_all_glibc-2.8-nscd-one-fork.patch yann@1201: yann@1201: -= BEGIN original header =- yann@1201: only fork one to assist in stop-start-daemon assumptions about daemon behavior yann@1201: yann@1201: http://bugs.gentoo.org/190785 yann@1201: yann@1201: -= END original header =- yann@1201: yann@1201: diff -durN glibc-2_9.orig/nscd/nscd.c glibc-2_9/nscd/nscd.c yann@1201: --- glibc-2_9.orig/nscd/nscd.c 2008-03-29 19:08:12.000000000 +0100 yann@1201: +++ glibc-2_9/nscd/nscd.c 2009-02-02 22:01:10.000000000 +0100 yann@1201: @@ -179,6 +179,9 @@ yann@1201: if (pid != 0) yann@1201: exit (0); yann@1201: yann@1201: + if (write_pid (_PATH_NSCDPID) < 0) yann@1201: + dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno)); yann@1201: + yann@1201: int nullfd = open (_PATH_DEVNULL, O_RDWR); yann@1201: if (nullfd != -1) yann@1201: { yann@1201: @@ -228,12 +231,6 @@ yann@1201: for (i = min_close_fd; i < getdtablesize (); i++) yann@1201: close (i); yann@1201: yann@1201: - pid = fork (); yann@1201: - if (pid == -1) yann@1201: - error (EXIT_FAILURE, errno, _("cannot fork")); yann@1201: - if (pid != 0) yann@1201: - exit (0); yann@1201: - yann@1201: setsid (); yann@1201: yann@1201: if (chdir ("/") != 0) yann@1201: @@ -242,9 +239,6 @@ yann@1201: yann@1201: openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON); yann@1201: yann@1201: - if (write_pid (_PATH_NSCDPID) < 0) yann@1201: - dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno)); yann@1201: - yann@1201: if (!init_logfile ()) yann@1201: dbg_log (_("Could not create log file")); yann@1201: