summaryrefslogtreecommitdiff
path: root/packages/glibc/2.16.0/0018-nscd-one-fork.patch
blob: 0d72f07d62d71e993aeb7f2b020f3de1d32822ab (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
only fork one to assist in stop-start-daemon assumptions about daemon behavior

http://bugs.gentoo.org/190785

---
 nscd/nscd.c |   15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -203,6 +203,9 @@
 	    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)
 	{
@@ -252,15 +255,6 @@
 	for (i = min_close_fd; i < getdtablesize (); i++)
 	  close (i);
 
-      if (run_mode == RUN_DAEMONIZE)
-	{
-	  pid = fork ();
-	  if (pid == -1)
-	    error (EXIT_FAILURE, errno, _("cannot fork"));
-	  if (pid != 0)
-	    exit (0);
-	}
-
       setsid ();
 
       if (chdir ("/") != 0)
@@ -269,9 +263,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"));