Changeset 140 for branches/samba-3.0/source/nsswitch/winbindd.c

Timestamp:

Jul 11, 2008, 1:13:42 AM (17 years ago)

Author:

Paul Smedley

Message:

Update branch to 3.0.31 release

File:

• branches/samba-3.0/source/nsswitch/winbindd.c (modified) (3 diffs)

branches/samba-3.0/source/nsswitch/winbindd.c

@@ -118 +118 @@
 /* Handle the signal by unlinking socket and exiting */
 
-static void terminate(void)
-{
-        pstring path;
-
-        /* Remove socket file */
-        pstr_sprintf(path, "%s/%s", 
-                 WINBINDD_SOCKET_DIR, WINBINDD_SOCKET_NAME);
-        unlink(path);
+static void terminate(bool in_parent)
+{
+        if (in_parent) {
+                /* When parent goes away we should
+                 * remove the socket file. Not so
+                 * when children terminate.
+                 */ 
+
+                pstring path;
+
+                /* Remove socket file */
+                pstr_sprintf(path, "%s/%s", 
+                        WINBINDD_SOCKET_DIR, WINBINDD_SOCKET_NAME);
+                unlink(path);
+        }
 
         idmap_close();
@@ -732 +739 @@
 
 /* check if TERM has been received */
-void winbind_check_sigterm(void)
+void winbind_check_sigterm(bool in_parent)
 {
         if (do_sigterm)
-                terminate();
+                terminate(in_parent);
 }
 
@@ -902 +909 @@
         /* Check signal handling things */
 
-        winbind_check_sigterm();
+        winbind_check_sigterm(true);
         winbind_check_sighup();