diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-07-15 07:44:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:57:37 -0500 |
| commit | ee7eb7c5155434c1bb6774311c1426f25c41b7ea (patch) | |
| tree | 9512f8ac75e6ab171c4801f622ff95472a4fa176 /source4/smbd/service.c | |
| parent | 6f47dec36459dda22130ff36f7cdf8b675a28742 (diff) | |
| download | samba-ee7eb7c5155434c1bb6774311c1426f25c41b7ea.tar.gz samba-ee7eb7c5155434c1bb6774311c1426f25c41b7ea.tar.bz2 samba-ee7eb7c5155434c1bb6774311c1426f25c41b7ea.zip | |
r1512: fixed a bug where we could reference the timer event handler after destruction
(This used to be commit e966d8a1f398dc1ddf5843bc3327a3160f0d49f9)
Diffstat (limited to 'source4/smbd/service.c')
| -rw-r--r-- | source4/smbd/service.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } } |