patches/glibc/ports-2.12.1/300-nscd-one-fork.patch
author "Yann E. MORIN" <yann.morin.1998@free.fr>
Wed Dec 05 20:31:43 2012 +0100 (2012-12-05)
changeset 3134 863723936e24
permissions -rw-r--r--
scripts/xldd: use user's sed and grep

xldd uses sed and grep as detected by ./configure. This works well if is
used on the machine that build the toolchain.

But if the user moves the toolchain to another machine where sed and grep
are not in the same directory (eg. /bin/sed vs. /usr/bin/sed), then xldd
will stop functionning.

Fix that by using ${SED} and ${GREP} if they are set in the environment.

Reported-by: Samuel Martin <s.martin49@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
yann@2437
     1
only fork one to assist in stop-start-daemon assumptions about daemon behavior
yann@2437
     2
yann@2437
     3
http://bugs.gentoo.org/190785
yann@2437
     4
yann@2437
     5
diff -durN glibc-2.12.1.orig/nscd/nscd.c glibc-2.12.1/nscd/nscd.c
yann@2437
     6
--- glibc-2.12.1.orig/nscd/nscd.c	2009-02-06 21:10:27.000000000 +0100
yann@2437
     7
+++ glibc-2.12.1/nscd/nscd.c	2009-11-13 00:50:24.000000000 +0100
yann@2437
     8
@@ -182,6 +182,9 @@
yann@2437
     9
       if (pid != 0)
yann@2437
    10
 	exit (0);
yann@2437
    11
 
yann@2437
    12
+       if (write_pid (_PATH_NSCDPID) < 0)
yann@2437
    13
+	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
yann@2437
    14
+
yann@2437
    15
       int nullfd = open (_PATH_DEVNULL, O_RDWR);
yann@2437
    16
       if (nullfd != -1)
yann@2437
    17
 	{
yann@2437
    18
@@ -231,12 +234,6 @@
yann@2437
    19
 	for (i = min_close_fd; i < getdtablesize (); i++)
yann@2437
    20
 	  close (i);
yann@2437
    21
 
yann@2437
    22
-      pid = fork ();
yann@2437
    23
-      if (pid == -1)
yann@2437
    24
-	error (EXIT_FAILURE, errno, _("cannot fork"));
yann@2437
    25
-      if (pid != 0)
yann@2437
    26
-	exit (0);
yann@2437
    27
-
yann@2437
    28
       setsid ();
yann@2437
    29
 
yann@2437
    30
       if (chdir ("/") != 0)
yann@2437
    31
@@ -245,9 +242,6 @@
yann@2437
    32
 
yann@2437
    33
       openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
yann@2437
    34
 
yann@2437
    35
-      if (write_pid (_PATH_NSCDPID) < 0)
yann@2437
    36
-	dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
yann@2437
    37
-
yann@2437
    38
       if (!init_logfile ())
yann@2437
    39
 	dbg_log (_("Could not create log file"));
yann@2437
    40