summaryrefslogtreecommitdiff
path: root/patches/glibc/2.9/360-2.8-nscd-one-fork.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/glibc/2.9/360-2.8-nscd-one-fork.patch')
-rw-r--r--patches/glibc/2.9/360-2.8-nscd-one-fork.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/patches/glibc/2.9/360-2.8-nscd-one-fork.patch b/patches/glibc/2.9/360-2.8-nscd-one-fork.patch
new file mode 100644
index 0000000..c9bf014
--- /dev/null
+++ b/patches/glibc/2.9/360-2.8-nscd-one-fork.patch
@@ -0,0 +1,45 @@
+Original patch from: gentoo/src/patchsets/glibc/2.9/1160_all_glibc-2.8-nscd-one-fork.patch
+
+-= BEGIN original header =-
+only fork one to assist in stop-start-daemon assumptions about daemon behavior
+
+http://bugs.gentoo.org/190785
+
+-= END original header =-
+
+diff -durN glibc-2_9.orig/nscd/nscd.c glibc-2_9/nscd/nscd.c
+--- glibc-2_9.orig/nscd/nscd.c 2008-03-29 19:08:12.000000000 +0100
++++ glibc-2_9/nscd/nscd.c 2009-02-02 22:01:10.000000000 +0100
+@@ -179,6 +179,9 @@
+ if (pid != 0)
+ exit (0);
+
++ if (write_pid (_PATH_NSCDPID) < 0)
++ dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
++
+ int nullfd = open (_PATH_DEVNULL, O_RDWR);
+ if (nullfd != -1)
+ {
+@@ -228,12 +231,6 @@
+ for (i = min_close_fd; i < getdtablesize (); i++)
+ close (i);
+
+- pid = fork ();
+- if (pid == -1)
+- error (EXIT_FAILURE, errno, _("cannot fork"));
+- if (pid != 0)
+- exit (0);
+-
+ setsid ();
+
+ if (chdir ("/") != 0)
+@@ -242,9 +239,6 @@
+
+ openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
+
+- if (write_pid (_PATH_NSCDPID) < 0)
+- dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
+-
+ if (!init_logfile ())
+ dbg_log (_("Could not create log file"));
+