svn commit: samba r4685 - in branches/SAMBA_4_0/source/smbd: .

[metze at samba.org]

Author: metze
Date: 2005-01-11 15:18:18 +0000 (Tue, 11 Jan 2005)
New Revision: 4685

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

Log:
only remove events when we have them

metze

Modified:
   branches/SAMBA_4_0/source/smbd/service.c


Changeset:
Modified: branches/SAMBA_4_0/source/smbd/service.c
===================================================================
--- branches/SAMBA_4_0/source/smbd/service.c	2005-01-11 14:32:15 UTC (rev 4684)
+++ branches/SAMBA_4_0/source/smbd/service.c	2005-01-11 15:18:18 UTC (rev 4685)
@@ -192,10 +192,14 @@
 
 	socket_destroy(conn->socket);
 
-	event_remove_fd(conn->event.ctx, conn->event.fde);
-	conn->event.fde = NULL;
-	event_remove_timed(conn->event.ctx, conn->event.idle);
-	conn->event.idle = NULL;
+	if (conn->event.fde) {
+		event_remove_fd(conn->event.ctx, conn->event.fde);
+		conn->event.fde = NULL;
+	}
+	if (conn->event.idle) {
+		event_remove_timed(conn->event.ctx, conn->event.idle);
+		conn->event.idle = NULL;
+	}
 
 	DLIST_REMOVE(conn->server_socket->connection_list, conn);