r4685: only remove events when we have them

metze
(This used to be commit d2276a9149b14aed459e9492384c0a7563dd154c)

diff --git a/source4/smbd/service.c b/source4/smbd/service.c
index fac0e175a15dacb71d547587c789c19158a3e9c5..586c05c2c63ca10b4a49db6e6df9bff8b01ad5dc 100644 (file)
--- a/source4/smbd/service.c
+++ b/source4/smbd/service.c
@@ -192,10 +192,14 @@ static int server_destructor(void *ptr)
 
        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);