From: Andreas Schwab <schwab@suse.de>
Date: Sun, 23 Dec 2012 08:45:07 +0000 (+0100)
Subject: nscd: don't fork twice
X-Git-Tag: glibc-2.18~405
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0582f6b3d6fab2128ee43a06250571922ee7c1e3;p=thirdparty%2Fglibc.git

nscd: don't fork twice
---

diff --git a/ChangeLog b/ChangeLog
index ac1d2637a09..6a02e77d1c0 100644
--- 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 26cf3c26929..ffbc6f8bc98 100644
--- 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)