svn commit: samba r23577 - 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-21 22:10:41 +0000 (Thu, 21 Jun 2007)
New Revision: 23577

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

Log:
Fix winbindd (sorry). Ensure I set the new child_pid
variable at the correct point just before the write
call is scheduled.
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-21 21:17:06 UTC (rev 23576)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_dual.c	2007-06-21 22:10:41 UTC (rev 23577)
@@ -131,7 +131,6 @@
 	state->response = response;
 	state->continuation = continuation;
 	state->private_data = private_data;
-	state->child_pid = child->pid;
 
 	DLIST_ADD_END(child->requests, state, struct winbindd_async_request *);
 
@@ -306,6 +305,9 @@
 		return;
 	}
 
+	/* Now we know who we're sending to - remember the pid. */
+	request->child_pid = child->pid;
+
 	setup_async_write(&child->event, request->request,
 			  sizeof(*request->request),
 			  async_main_request_sent, request);

Modified: branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c	2007-06-21 21:17:06 UTC (rev 23576)
+++ branches/SAMBA_3_0_25/source/nsswitch/winbindd_dual.c	2007-06-21 22:10:41 UTC (rev 23577)
@@ -131,7 +131,6 @@
 	state->response = response;
 	state->continuation = continuation;
 	state->private_data = private_data;
-	state->child_pid = child->pid;
 
 	DLIST_ADD_END(child->requests, state, struct winbindd_async_request *);
 
@@ -306,6 +305,9 @@
 		return;
 	}
 
+	/* Now we know who we're sending to - remember the pid. */
+	request->child_pid = child->pid;
+
 	setup_async_write(&child->event, request->request,
 			  sizeof(*request->request),
 			  async_main_request_sent, request);

Modified: branches/SAMBA_3_0_26/source/nsswitch/winbindd_dual.c
===================================================================
--- branches/SAMBA_3_0_26/source/nsswitch/winbindd_dual.c	2007-06-21 21:17:06 UTC (rev 23576)
+++ branches/SAMBA_3_0_26/source/nsswitch/winbindd_dual.c	2007-06-21 22:10:41 UTC (rev 23577)
@@ -131,7 +131,6 @@
 	state->response = response;
 	state->continuation = continuation;
 	state->private_data = private_data;
-	state->child_pid = child->pid;
 
 	DLIST_ADD_END(child->requests, state, struct winbindd_async_request *);
 
@@ -306,6 +305,9 @@
 		return;
 	}
 
+	/* Now we know who we're sending to - remember the pid. */
+	request->child_pid = child->pid;
+
 	setup_async_write(&child->event, request->request,
 			  sizeof(*request->request),
 			  async_main_request_sent, request);