svn commit: samba r22632 - in branches/SAMBA_4_0/source/lib/events: .

tridge at samba.org tridge at samba.org
Tue May 1 20:57:55 GMT 2007


Author: tridge
Date: 2007-05-01 20:57:54 +0000 (Tue, 01 May 2007)
New Revision: 22632

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22632

Log:
merged volkers select events fix
Modified:
   branches/SAMBA_4_0/source/lib/events/events_standard.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/events/events_standard.c
===================================================================
--- branches/SAMBA_4_0/source/lib/events/events_standard.c	2007-05-01 20:03:44 UTC (rev 22631)
+++ branches/SAMBA_4_0/source/lib/events/events_standard.c	2007-05-01 20:57:54 UTC (rev 22632)
@@ -380,7 +380,8 @@
 	fde->additional_data	= NULL;
 
 	DLIST_ADD(std_ev->fd_events, fde);
-	if (fde->fd > std_ev->maxfd) {
+	if ((std_ev->maxfd != EVENT_INVALID_MAXFD)
+	    && (fde->fd > std_ev->maxfd)) {
 		std_ev->maxfd = fde->fd;
 	}
 	talloc_set_destructor(fde, std_event_fd_destructor);



More information about the samba-cvs mailing list