patches/glibc/ports-2.10.1/300-nscd-one-fork.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Tue Jan 12 19:24:03 2010 +0100 (2010-01-12)
changeset 1761 88020b2c3246
permissions -rw-r--r--
scripts/functions: change handling of nochdir

- 'nochdir' must be the first option
- have systematic pushd/popd, even if nochdir
     1 only fork one to assist in stop-start-daemon assumptions about daemon behavior
     2 
     3 http://bugs.gentoo.org/190785
     4 
     5 diff -durN glibc-2.10.1.orig/nscd/nscd.c glibc-2.10.1/nscd/nscd.c
     6 --- glibc-2.10.1.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
     7 +++ glibc-2.10.1/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
     8 @@ -182,6 +182,9 @@
     9        if (pid != 0)
    10  	exit (0);
    11  
    12 +       if (write_pid (_PATH_NSCDPID) < 0)
    13 +	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
    14 +
    15        int nullfd = open (_PATH_DEVNULL, O_RDWR);
    16        if (nullfd != -1)
    17  	{
    18 @@ -231,12 +234,6 @@
    19  	for (i = min_close_fd; i < getdtablesize (); i++)
    20  	  close (i);
    21  
    22 -      pid = fork ();
    23 -      if (pid == -1)
    24 -	error (EXIT_FAILURE, errno, _("cannot fork"));
    25 -      if (pid != 0)
    26 -	exit (0);
    27 -
    28        setsid ();
    29  
    30        if (chdir ("/") != 0)
    31 @@ -245,9 +242,6 @@
    32  
    33        openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
    34  
    35 -      if (write_pid (_PATH_NSCDPID) < 0)
    36 -        dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
    37 -
    38        if (!init_logfile ())
    39  	dbg_log (_("Could not create log file"));
    40