From: Volker Lendecke <vl@samba.org>
Date: Sat, 16 May 2009 13:42:53 +0000 (+0200)
Subject: s3-events: If immediate requests are pending, the timeout is 0
X-Git-Tag: tdb-1.1.5~511
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad91ef7f968b289f449fdeb2eb4b1cdbfa682b4d;p=thirdparty%2Fsamba.git

s3-events: If immediate requests are pending, the timeout is 0
---

diff --git a/source3/lib/events.c b/source3/lib/events.c
index 90d86c6c79f..6fc3a9727bd 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -70,6 +70,11 @@ bool event_add_to_select_args(struct tevent_context *ev,
 		}
 	}
 
+	if (ev->immediate_events != NULL) {
+		*timeout = timeval_zero();
+		return true;
+	}
+
 	if (ev->timer_events == NULL) {
 		return ret;
 	}
@@ -140,6 +145,10 @@ struct timeval *get_timed_events_timeout(struct tevent_context *ev,
 	if (ev->timer_events == NULL) {
 		return NULL;
 	}
+	if (ev->immediate_events != NULL) {
+		*to_ret = timeval_zero();
+		return to_ret;
+	}
 
 	now = timeval_current();
 	*to_ret = timeval_until(&now, &ev->timer_events->next_event);