summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-04-11 13:37:42 +0200
committerVolker Lendecke <vlendec@samba.org>2011-04-11 14:35:45 +0200
commit09586950225e880bbd6d9e147c884c5886c4d0a4 (patch)
treeb672babdd72c2e9d4e6706de88d8b3a07aac057a
parente6cf92c574fba14132757f141d8b1242fa71be88 (diff)
downloadsamba-09586950225e880bbd6d9e147c884c5886c4d0a4.tar.gz
samba-09586950225e880bbd6d9e147c884c5886c4d0a4.tar.bz2
samba-09586950225e880bbd6d9e147c884c5886c4d0a4.zip
s3: Fix timeout calculation in event_add_to_poll_args
In the initial phase nmbd does not yet have timed events. This led to nmbd not correctly registering its names in make test and certainly everywhere else. Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Mon Apr 11 14:35:45 CEST 2011 on sn-devel-104
-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 d19c79e34b..e461ebe977 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -166,7 +166,7 @@ bool event_add_to_poll_args(struct tevent_context *ev, TALLOC_CTX *mem_ctx,
return true;
}
if (ev->timer_events == NULL) {
- *ptimeout = INT_MAX;
+ *ptimeout = MIN(*ptimeout, INT_MAX);
return true;
}