nscd: don't fork twice

diff --git a/ChangeLog b/ChangeLog
index ac1d2637a09115fa1048efcb4f8a1f62b852afd6..6a02e77d1c0a2d69a0cdd68a4f281d8bd0040d5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-15  Andreas Schwab  <schwab@suse.de>
+
+       * nscd/nscd.c (main): Don't fork again after closing files.
+
 2013-04-15  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
        * libio/tst-fwrite-error.c (do_test): Fix BUF array definition.

diff --git a/nscd/nscd.c b/nscd/nscd.c
index 26cf3c269293b909ba1676b9bdc51f0bdd3bea87..ffbc6f8bc98907cbdb016812f0cb7ff39ace6ec8 100644 (file)
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -252,15 +252,6 @@ main (int argc, char **argv)
        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)