From 09586950225e880bbd6d9e147c884c5886c4d0a4 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 11 Apr 2011 13:37:42 +0200 Subject: 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 Autobuild-Date: Mon Apr 11 14:35:45 CEST 2011 on sn-devel-104 --- source3/lib/events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3') 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; } -- cgit