svn commit: samba r4886 - in branches/SAMBA_4_0/source: libcli/raw librpc/rpc

tridge at samba.org tridge at samba.org
Fri Jan 21 06:55:34 GMT 2005


Author: tridge
Date: 2005-01-21 06:55:33 +0000 (Fri, 21 Jan 2005)
New Revision: 4886

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

Log:
fixed two places where we process the send side of a socket after the
recv side in the same event. That's a bad idea, as the first callback
could decide to destroy the socket.

Modified:
   branches/SAMBA_4_0/source/libcli/raw/clitransport.c
   branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c


Changeset:
Modified: branches/SAMBA_4_0/source/libcli/raw/clitransport.c
===================================================================
--- branches/SAMBA_4_0/source/libcli/raw/clitransport.c	2005-01-21 06:54:10 UTC (rev 4885)
+++ branches/SAMBA_4_0/source/libcli/raw/clitransport.c	2005-01-21 06:55:33 UTC (rev 4886)
@@ -40,6 +40,7 @@
 
 	if (flags & EVENT_FD_READ) {
 		smbcli_transport_process_recv(transport);
+		return;
 	}
 	if (flags & EVENT_FD_WRITE) {
 		smbcli_transport_process_send(transport);

Modified: branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c
===================================================================
--- branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c	2005-01-21 06:54:10 UTC (rev 4885)
+++ branches/SAMBA_4_0/source/librpc/rpc/dcerpc_sock.c	2005-01-21 06:55:33 UTC (rev 4886)
@@ -199,6 +199,7 @@
 
 	if (flags & EVENT_FD_WRITE) {
 		sock_process_send(p);
+		return;
 	}
 
 	if (sock->sock == NULL) {



More information about the samba-cvs mailing list