svn commit: samba r23448 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch SAMBA_3_0_26/source/nsswitch

[jra at samba.org]

Author: jra
Date: 2007-06-12 19:53:51 +0000 (Tue, 12 Jun 2007)
New Revision: 23448

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23448

Log:
Doh ! Don't call winbind_child_died() *before* the
kill call as that sets pid = 0 ! :-).
Jeremy.

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c
   branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c
   branches/SAMBA_3_0_26/source/nsswitch/winbindd_dual.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c	2007-06-12 19:47:33 UTC (rev 23447)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c	2007-06-12 19:53:51 UTC (rev 23448)
@@ -178,19 +178,18 @@
 
 	async_reply_recv(private_data, False);
 
-	/* 
-	 * Close the socket to the child. Should cause the
-	 * child to exit.
-	 */
-
 	DEBUG(0,("async_request_timeout_handler: child pid %u is not responding. "
 		"Closing connection to it.\n",
 		state->child->pid ));
 
-	winbind_child_died(state->child->pid);
-
 	/* Send kill signal to child. */
 	kill(state->child->pid, SIGTERM);
+
+	/* 
+	 * Close the socket to the child.
+	 */
+
+	winbind_child_died(state->child->pid);
 }
 
 static void async_request_sent(void *private_data_data, BOOL success)

Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c	2007-06-12 19:47:33 UTC (rev 23447)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c	2007-06-12 19:53:51 UTC (rev 23448)
@@ -178,19 +178,18 @@
 
 	async_reply_recv(private_data, False);
 
-	/* 
-	 * Close the socket to the child. Should cause the
-	 * child to exit.
-	 */
-
 	DEBUG(0,("async_request_timeout_handler: child pid %u is not responding. "
 		"Closing connection to it.\n",
 		state->child->pid ));
 
-	winbind_child_died(state->child->pid);
-
 	/* Send kill signal to child. */
 	kill(state->child->pid, SIGTERM);
+
+	/* 
+	 * Close the socket to the child.
+	 */
+
+	winbind_child_died(state->child->pid);
 }
 
 static void async_request_sent(void *private_data_data, BOOL success)

Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_dual.c
===================================================================
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_dual.c	2007-06-12 19:47:33 UTC (rev 23447)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_dual.c	2007-06-12 19:53:51 UTC (rev 23448)
@@ -178,19 +178,18 @@
 
 	async_reply_recv(private_data, False);
 
-	/* 
-	 * Close the socket to the child. Should cause the
-	 * child to exit.
-	 */
-
 	DEBUG(0,("async_request_timeout_handler: child pid %u is not responding. "
 		"Closing connection to it.\n",
 		state->child->pid ));
 
-	winbind_child_died(state->child->pid);
-
 	/* Send kill signal to child. */
 	kill(state->child->pid, SIGTERM);
+
+	/* 
+	 * Close the socket to the child.
+	 */
+
+	winbind_child_died(state->child->pid);
 }
 
 static void async_request_sent(void *private_data_data, BOOL success)