s3-events: Not only timed, also immediate events generate a timeout return

[ira/wip.git] / source3 / lib / events.c

diff --git a/source3/lib/events.c b/source3/lib/events.c
index 6fc3a9727bd96a2a0019987da07a53e64313e6a7..08debb42528aa9cc5e1cf551f89e193bfd27267f 100644 (file)
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -142,7 +142,7 @@ struct timeval *get_timed_events_timeout(struct tevent_context *ev,
 {
        struct timeval now;
 
-       if (ev->timer_events == NULL) {
+       if ((ev->timer_events == NULL) && (ev->immediate_events == NULL)) {
                return NULL;
        }
        if (ev->immediate_events != NULL) {