svn commit: samba r5193 - in branches/SAMBA_4_0/source: smb_server smbd

tridge at samba.org tridge at samba.org
Thu Feb 3 08:20:32 GMT 2005


Author: tridge
Date: 2005-02-03 08:20:31 +0000 (Thu, 03 Feb 2005)
New Revision: 5193

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

Log:
make sure we mark the event dead when we free it on a dead connection


Modified:
   branches/SAMBA_4_0/source/smb_server/smb_server.c
   branches/SAMBA_4_0/source/smbd/service_stream.c


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb_server.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb_server.c	2005-02-03 04:40:52 UTC (rev 5192)
+++ branches/SAMBA_4_0/source/smb_server/smb_server.c	2005-02-03 08:20:31 UTC (rev 5193)
@@ -663,6 +663,7 @@
 	status = receive_smb_request(smb_conn, t);
 	if (NT_STATUS_IS_ERR(status)) {
 		talloc_free(conn->event.fde);
+		conn->event.fde = NULL;
 		smbsrv_terminate_connection(smb_conn, nt_errstr(status));
 		return;
 	}

Modified: branches/SAMBA_4_0/source/smbd/service_stream.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/service_stream.c	2005-02-03 04:40:52 UTC (rev 5192)
+++ branches/SAMBA_4_0/source/smbd/service_stream.c	2005-02-03 08:20:31 UTC (rev 5193)
@@ -97,10 +97,10 @@
 
 	srv_conn->private       = stream_socket->private;
 	srv_conn->model_ops     = stream_socket->model_ops;
-	srv_conn->event.ctx	= ev;
 	srv_conn->socket	= sock;
 	srv_conn->server_id	= server_id;
 	srv_conn->ops           = stream_socket->ops;
+	srv_conn->event.ctx	= ev;
 	srv_conn->event.fde	= event_add_fd(ev, srv_conn, socket_get_fd(sock),
 					       EVENT_FD_READ, 
 					       stream_io_handler, srv_conn);



More information about the samba-cvs mailing list