[SCM] Samba Shared Repository - branch v3-6-test updated
Volker Lendecke
vlendec at samba.org
Mon Apr 11 07:32:58 MDT 2011
The branch, v3-6-test has been updated
via 246657b s3: Fix timeout calculation in event_add_to_poll_args
from 42ad763 s3-modules: Fix debug message
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 246657b06e518674129abc7f0c141c3e85d9cc8b
Author: Volker Lendecke <vl at samba.org>
Date: Mon Apr 11 13:37:42 2011 +0200
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 at samba.org>
Autobuild-Date: Mon Apr 11 14:35:45 CEST 2011 on sn-devel-104
(cherry picked from commit 09586950225e880bbd6d9e147c884c5886c4d0a4)
-----------------------------------------------------------------------
Summary of changes:
source3/lib/events.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/events.c b/source3/lib/events.c
index d19c79e..e461ebe 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;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list