From ee7eb7c5155434c1bb6774311c1426f25c41b7ea Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 15 Jul 2004 07:44:46 +0000
Subject: r1512: fixed a bug where we could reference the timer event handler
 after destruction (This used to be commit
 e966d8a1f398dc1ddf5843bc3327a3160f0d49f9)

---
 source4/smbd/service.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/smbd/service.c')

diff --git a/source4/smbd/service.c b/source4/smbd/service.c
index 2b6e0579fa..52ff088db3 100644
--- a/source4/smbd/service.c
+++ b/source4/smbd/service.c
@@ -182,14 +182,14 @@ void server_io_handler(struct event_context *ev, struct fd_event *fde, time_t t,
 {
 	struct server_connection *conn = fde->private;
 
+	conn->event.idle->next_event = t + conn->event.idle_time;
+
 	if (flags & EVENT_FD_WRITE) {
 		conn->service->ops->send_handler(conn, t, flags);
-		conn->event.idle->next_event = t + conn->event.idle_time;
 	}
 
 	if (flags & EVENT_FD_READ) {
 		conn->service->ops->recv_handler(conn, t, flags);
-		conn->event.idle->next_event = t + conn->event.idle_time;
 	}
 
 }
-- 
cgit