The branch, master has been updated
via 834fc3786e60b16ff86be3ea47a5d6ed8da6c7b8 (commit)
from 4112bb2428eccdf21c831d6f846fa055b1d1d7d3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 834fc3786e60b16ff86be3ea47a5d6ed8da6c7b8
Author: Volker Lendecke <[email protected]>
Date: Sun May 17 11:43:54 2009 +0200
s3-events: Not only timed, also immediate events generate a timeout return
-----------------------------------------------------------------------
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 6fc3a97..08debb4 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) {
--
Samba Shared Repository
