From: Volker Lendecke <vl@samba.org>
Date: Sun, 17 May 2009 09:43:54 +0000 (+0200)
Subject: s3-events: Not only timed, also immediate events generate a timeout return
X-Git-Tag: tdb-1.1.5~506
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=834fc3786e60b16ff86be3ea47a5d6ed8da6c7b8;p=thirdparty%2Fsamba.git

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

diff --git a/source3/lib/events.c b/source3/lib/events.c
index 6fc3a9727bd..08debb42528 100644
--- 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) {