| author | Arnaud Lacombe <lacombar@gmail.com> |
| Thu Aug 05 17:59:51 2010 +0200 (2010-08-05) | |
| changeset 2069 | 366bd2b22675 |
| permissions | -rw-r--r-- |
| yann@1625 | 1 |
only fork one to assist in stop-start-daemon assumptions about daemon behavior |
| yann@1625 | 2 |
|
| yann@1625 | 3 |
http://bugs.gentoo.org/190785 |
| yann@1625 | 4 |
|
| yann@1625 | 5 |
diff -durN glibc-2.10.1.orig/nscd/nscd.c glibc-2.10.1/nscd/nscd.c |
| yann@1625 | 6 |
--- glibc-2.10.1.orig/nscd/nscd.c 2009-02-06 21:10:27.000000000 +0100 |
| yann@1625 | 7 |
+++ glibc-2.10.1/nscd/nscd.c 2009-11-13 00:50:24.000000000 +0100 |
| yann@1625 | 8 |
@@ -182,6 +182,9 @@ |
| yann@1625 | 9 |
if (pid != 0) |
| yann@1625 | 10 |
exit (0); |
| yann@1625 | 11 |
|
| yann@1625 | 12 |
+ if (write_pid (_PATH_NSCDPID) < 0) |
| yann@1625 | 13 |
+ dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
|
| yann@1625 | 14 |
+ |
| yann@1625 | 15 |
int nullfd = open (_PATH_DEVNULL, O_RDWR); |
| yann@1625 | 16 |
if (nullfd != -1) |
| yann@1625 | 17 |
{
|
| yann@1625 | 18 |
@@ -231,12 +234,6 @@ |
| yann@1625 | 19 |
for (i = min_close_fd; i < getdtablesize (); i++) |
| yann@1625 | 20 |
close (i); |
| yann@1625 | 21 |
|
| yann@1625 | 22 |
- pid = fork (); |
| yann@1625 | 23 |
- if (pid == -1) |
| yann@1625 | 24 |
- error (EXIT_FAILURE, errno, _("cannot fork"));
|
| yann@1625 | 25 |
- if (pid != 0) |
| yann@1625 | 26 |
- exit (0); |
| yann@1625 | 27 |
- |
| yann@1625 | 28 |
setsid (); |
| yann@1625 | 29 |
|
| yann@1625 | 30 |
if (chdir ("/") != 0)
|
| yann@1625 | 31 |
@@ -245,9 +242,6 @@ |
| yann@1625 | 32 |
|
| yann@1625 | 33 |
openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);
|
| yann@1625 | 34 |
|
| yann@1625 | 35 |
- if (write_pid (_PATH_NSCDPID) < 0) |
| yann@1625 | 36 |
- dbg_log ("%s: %s", _PATH_NSCDPID, strerror (errno));
|
| yann@1625 | 37 |
- |
| yann@1625 | 38 |
if (!init_logfile ()) |
| yann@1625 | 39 |
dbg_log (_("Could not create log file"));
|
| yann@1625 | 40 |