From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 10 Apr 2009 08:17:40 +0000 (+1200)
Subject: Author: Henrik Nordstrom <henrik@henriknordstrom.net>
X-Git-Tag: SQUID_3_0_STABLE14~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87d28cd01ad8396e9a1cfdd2a25a7ac9e532a21f;p=thirdparty%2Fsquid.git

Author: Henrik Nordstrom <henrik@henriknordstrom.net>
Bug #2605: Don't call setsid() on helper childs when running in daemon mode
---

diff --git a/src/ipc.cc b/src/ipc.cc
index c844d136ee..576aa5e1f2 100644
--- a/src/ipc.cc
+++ b/src/ipc.cc
@@ -381,13 +381,9 @@ ipcCreate(int type, const char *prog, const char *const args[], const char *name
     for (x = 3; x < SQUID_MAXFD; x++)
         close(x);
 
-    if (opt_no_daemon) {
-        squid_signal(SIGINT, SIG_IGN, SA_RESETHAND);
-        squid_signal(SIGHUP, SIG_IGN, SA_RESETHAND);
-    }
-
 #if HAVE_SETSID
-    setsid();
+    if (opt_no_daemon)
+	setsid();
 #endif
 
     execvp(prog, (char *const *) args);