[email protected] wrote: > Full_Name: Doug Leavitt > Version: HEAD > OS: Solaris > URL: ftp://ftp.openldap.org/incoming/ > Submission from: (NULL) (192.18.43.225) > > > Two syntax errors were introduced into daemon.c as a result of: > the commits to change daemon.c 1.444 -> 1.445 -> 1.446 > > > Specifically two calls to SLAP_EVENT_MAX are missing the new (t) argument. > > > --- a/servers/slapd/daemon.c Thu Aug 12 10:55:06 2010 -0500 > +++ b/servers/slapd/daemon.c Thu Aug 12 15:19:02 2010 -0500 > @@ -521,7 +521,7 @@ > > # define SLAP_EVENT_WAIT(t, tvp, nsp) do { \ > int i; \ > - *(nsp) = select( SLAP_EVENT_MAX,&readfds, \ > + *(nsp) = select( SLAP_EVENT_MAX(t),&readfds, \ > nwriters> 0 ?&writefds : NULL, NULL, (tvp) ); \ > for ( i=0; i<readfds.fd_count; i++) { \ > int fd = slapd_sock2fd(readfds.fd_array[i]); \ > @@ -666,7 +666,7 @@ > # define SLAP_EVENT_CLR_WRITE(fd) FD_CLR((fd),&writefds) > > # define SLAP_EVENT_WAIT(t, tvp, nsp) do { \ > - *(nsp) = select( SLAP_EVENT_MAX,&readfds, \ > + *(nsp) = select( SLAP_EVENT_MAX(t),&readfds, \ > nwriters> 0 ?&writefds : NULL, NULL, (tvp) ); \ > } while (0) > # endif /* !HAVE_WINSOCK */ > > Nice catch, thanks.
-- -- Howard Chu CTO, Symas Corp. http://www.symas.com Director, Highland Sun http://highlandsun.com/hyc/ Chief Architect, OpenLDAP http://www.openldap.org/project/
