summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-05-17 11:43:54 +0200
committerVolker Lendecke <vl@samba.org>2009-05-17 11:45:22 +0200
commit834fc3786e60b16ff86be3ea47a5d6ed8da6c7b8 (patch)
tree6340c3d6118e17dcbe917b75f32e0b3b9027c0c3
parent4112bb2428eccdf21c831d6f846fa055b1d1d7d3 (diff)
downloadsamba-834fc3786e60b16ff86be3ea47a5d6ed8da6c7b8.tar.gz
samba-834fc3786e60b16ff86be3ea47a5d6ed8da6c7b8.tar.bz2
samba-834fc3786e60b16ff86be3ea47a5d6ed8da6c7b8.zip
s3-events: Not only timed, also immediate events generate a timeout return
-rw-r--r--source3/lib/events.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/events.c b/source3/lib/events.c
index 6fc3a9727b..08debb4252 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) {