|
yann@1201
|
1 |
Original patch from: gentoo/src/patchsets/glibc/2.9/1160_all_glibc-2.8-nscd-one-fork.patch
|
|
yann@1201
|
2 |
|
|
yann@1201
|
3 |
-= BEGIN original header =-
|
|
yann@1201
|
4 |
only fork one to assist in stop-start-daemon assumptions about daemon behavior
|
|
yann@1201
|
5 |
|
|
yann@1201
|
6 |
http://bugs.gentoo.org/190785
|
|
yann@1201
|
7 |
|
|
yann@1201
|
8 |
-= END original header =-
|
|
yann@1201
|
9 |
|
|
yann@1201
|
10 |
diff -durN glibc-2_9.orig/nscd/nscd.c glibc-2_9/nscd/nscd.c
|
|
yann@1201
|
11 |
--- glibc-2_9.orig/nscd/nscd.c 2008-03-29 19:08:12.000000000 +0100
|
|
yann@1201
|
12 |
+++ glibc-2_9/nscd/nscd.c 2009-02-02 22:01:10.000000000 +0100
|
|
yann@1201
|
13 |
@@ -179,6 +179,9 @@
|
|
yann@1201
|
14 |
if (pid != 0)
|
|
yann@1201
|
15 |
exit (0);
|
|
yann@1201
|
16 |
|
|
yann@1201
|
17 |
+ if (write_pid (_PATH_NSCDPID) < 0)
|
|
yann@1201
|
18 |
+ dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
|
|
yann@1201
|
19 |
+
|
|
yann@1201
|
20 |
int nullfd = open (_PATH_DEVNULL, O_RDWR);
|
|
yann@1201
|
21 |
if (nullfd != -1)
|
|
yann@1201
|
22 |
{
|
|
yann@1201
|
23 |
@@ -228,12 +231,6 @@
|
|
yann@1201
|
24 |
for (i = min_close_fd; i < getdtablesize (); i++)
|
|
yann@1201
|
25 |
close (i);
|
|
yann@1201
|
26 |
|
|
yann@1201
|
27 |
- pid = fork ();
|
|
yann@1201
|
28 |
- if (pid == -1)
|
|
yann@1201
|
29 |
- error (EXIT_FAILURE, errno, _("cannot fork"));
|
|
yann@1201
|
30 |
- if (pid != 0)
|
|
yann@1201
|
31 |
- exit (0);
|
|
yann@1201
|
32 |
-
|
|
yann@1201
|
33 |
setsid ();
|
|
yann@1201
|
34 |
|
|
yann@1201
|
35 |
if (chdir ("/") != 0)
|
|
yann@1201
|
36 |
@@ -242,9 +239,6 @@
|
|
yann@1201
|
37 |
|
|
yann@1201
|
38 |
openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
|
|
yann@1201
|
39 |
|
|
yann@1201
|
40 |
- if (write_pid (_PATH_NSCDPID) < 0)
|
|
yann@1201
|
41 |
- dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
|
|
yann@1201
|
42 |
-
|
|
yann@1201
|
43 |
if (!init_logfile ())
|
|
yann@1201
|
44 |
dbg_log (_("Could not create log file"));
|
|
yann@1201
|
45 |
|