[SCM] Samba Shared Repository - branch v3-6-test updated

[Volker Lendecke]

The branch, v3-6-test has been updated
       via  0a84c30 s3: Fix an infinite loop
      from  60ceb0b s3: Fix connecting to port-139 only servers

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 0a84c3041a8f6f776d0c7811a30b77177ca150c0
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Jan 23 09:12:43 2011 +0100

    s3: Fix an infinite loop
    
    If select returns EBADF (which should NEVER happen), then we loop infinitely
    because the select masks seem all active.
    
    I've been given an strace where smbd floods syslog with inotify-related
    error messages. The strace shows that select returns EBADF, and we're calling
    the inotify event callback. It then complains there's no data on the inotify
    fd.
    
    Metze, please check!
    
    We might need to fix this in 3.4 and 3.5 as well. And we need to find the
    deeper reason where we close a file descriptor and don't tell the events
    system about it.
    
    Volker
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sun Jan 23 10:05:39 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 source3/lib/events.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/events.c b/source3/lib/events.c
index d987072..802a2e5 100644
--- a/source3/lib/events.c
+++ b/source3/lib/events.c
@@ -120,6 +120,10 @@ bool run_events(struct tevent_context *ev,
 		return false;
 	}
 
+	if (selrtn <= 0) {
+		return false;
+	}
+
 	for (fde = ev->fd_events; fde; fde = fde->next) {
 		uint16 flags = 0;
 


-- 
Samba Shared Repository