Mark areas needed poll(2) support with HAVE_POLL.

libraries/libldap/init.c

@@ -534,8 +534,10 @@ void ldap_int_initialize( struct ldapoptions *gopts, int *dbglvl )
 	|| defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
 	ldap_int_hostname = ldap_pvt_get_fqdn( ldap_int_hostname );
 #endif
-	if ( ldap_int_tblsize == 0 )
+
-		ldap_int_ip_init();
+#ifndef HAVE_POLL
+	if ( ldap_int_tblsize == 0 ) ldap_int_ip_init();
+#endif
 
 	ldap_int_initialize_global_options(gopts, NULL);
 

libraries/libldap/ldap-int.h

@@ -448,7 +448,11 @@ LDAP_F (int) ldap_int_open_connection( LDAP *ld,
 /*
  * in os-ip.c
  */
+#ifndef HAVE_POLL
 LDAP_V (int) ldap_int_tblsize;
+LDAP_F (void) ldap_int_ip_init( void );
+#endif
+
 LDAP_F (int) ldap_int_timeval_dup( struct timeval **dest,
 	const struct timeval *tm );
 LDAP_F (int) ldap_connect_to_host( LDAP *ld, Sockbuf *sb,
@@ -461,7 +465,6 @@ LDAP_F (char *) ldap_host_connected_to( Sockbuf *sb,
 	const char *host );
 #endif
 
-LDAP_F (void) ldap_int_ip_init( void );
 LDAP_F (int) ldap_int_select( LDAP *ld, struct timeval *timeout );
 LDAP_F (void *) ldap_new_select_info( void );
 LDAP_F (void) ldap_free_select_info( void *sip );

libraries/libldap/os-ip.c

@@ -39,8 +39,6 @@
 
 #include "ldap-int.h"
 
-int ldap_int_tblsize = 0;
-
 #if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP )
 #  ifdef LDAP_PF_INET6
 int ldap_int_inet4or6 = AF_UNSPEC;
@@ -212,10 +210,12 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s,
 {
 	int rc;
 	struct timeval	tv, *opt_tv=NULL;
+#ifndef HAVE_POLL
 	fd_set		wfds, *z=NULL;
 #ifdef HAVE_WINSOCK
 	fd_set		efds;
 #endif
+#endif
 
 #ifdef LDAP_CONNECTIONLESS
 	/* We could do a connect() but that would interfere with
@@ -258,6 +258,9 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s,
 	if ( async ) return ( -2 );
 #endif
 
+#ifdef HAVE_POLL
+	assert(0);
+#else
 	FD_ZERO(&wfds);
 	FD_SET(s, &wfds );
 
@@ -305,6 +308,8 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s,
 			return ( -1 );
 		return ( 0 );
 	}
+#endif
+
 	osip_debug(ld, "ldap_connect_timeout: timed out\n",0,0,0);
 	ldap_pvt_set_errno( ETIMEDOUT );
 	return ( -1 );
@@ -607,14 +612,18 @@ ldap_host_connected_to( Sockbuf *sb, const char *host )
 #endif
 
 
-/* for UNIX */
+#ifdef HAVE_POLL
+/* for UNIX poll(2) */
+	/* ??? */
+#else
+/* for UNIX select(2) */
 struct selectinfo {
 	fd_set	si_readfds;
 	fd_set	si_writefds;
 	fd_set	si_use_readfds;
 	fd_set	si_use_writefds;
 };
-
+#endif
 
 void
 ldap_mark_select_write( LDAP *ld, Sockbuf *sb )
@@ -708,10 +717,14 @@ ldap_free_select_info( void *sip )
 }
 
 
+#ifndef HAVE_POLL
+int ldap_int_tblsize = 0;
+
 void
 ldap_int_ip_init( void )
 {
 	int tblsize;
+
 #if defined( HAVE_SYSCONF )
 	tblsize = sysconf( _SC_OPEN_MAX );
 #elif defined( HAVE_GETDTABLESIZE )
@@ -721,11 +734,12 @@ ldap_int_ip_init( void )
 #endif /* !USE_SYSCONF */
 
 #ifdef FD_SETSIZE
-	if( tblsize > FD_SETSIZE )
+	if( tblsize > FD_SETSIZE ) tblsize = FD_SETSIZE;
-		tblsize = FD_SETSIZE;
 #endif	/* FD_SETSIZE*/
+
 	ldap_int_tblsize = tblsize;
 }
+#endif
 
 
 int
@@ -739,14 +753,20 @@ ldap_int_select( LDAP *ld, struct timeval *timeout )
 	Debug( LDAP_DEBUG_TRACE, "ldap_int_select\n", 0, 0, 0 );
 #endif
 
-	if ( ldap_int_tblsize == 0 )
+#ifndef HAVE_POLL
-		ldap_int_ip_init();
+	if ( ldap_int_tblsize == 0 ) ldap_int_ip_init();
+#endif
 
 	sip = (struct selectinfo *)ld->ld_selectinfo;
 	sip->si_use_readfds = sip->si_readfds;
 	sip->si_use_writefds = sip->si_writefds;
 	
+#ifdef HAVE_POLL
+	assert(0);
+	return -1;
+#else
 	return( select( ldap_int_tblsize,
 		&sip->si_use_readfds, &sip->si_use_writefds,
 		NULL, timeout ));
+#endif
 }

libraries/libldap/os-local.c

@@ -51,8 +51,6 @@
 #include "ldap-int.h"
 #include "ldap_defaults.h"
 
-/* int ldap_int_tblsize = 0; */
-
 #ifdef LDAP_DEBUG
 
 #define oslocal_debug(ld,fmt,arg1,arg2,arg3) \
@@ -169,7 +167,6 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_un *sa, int async)
 {
 	int rc;
 	struct timeval	tv, *opt_tv=NULL;
-	fd_set		wfds, *z=NULL;
 
 	if ( (opt_tv = ld->ld_options.ldo_tm_net) != NULL ) {
 		tv.tv_usec = opt_tv->tv_usec;
@@ -179,15 +176,13 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_un *sa, int async)
 	oslocal_debug(ld, "ldap_connect_timeout: fd: %d tm: %ld async: %d\n",
 		s, opt_tv ? tv.tv_sec : -1L, async);
 
-	if ( ldap_pvt_ndelay_on(ld, s) == -1 )
+	if ( ldap_pvt_ndelay_on(ld, s) == -1 ) return -1;
-		return ( -1 );
 
 	if ( connect(s, (struct sockaddr *) sa, sizeof(struct sockaddr_un))
 		!= AC_SOCKET_ERROR )
 	{
-		if ( ldap_pvt_ndelay_off(ld, s) == -1 ) {
+		if ( ldap_pvt_ndelay_off(ld, s) == -1 ) return -1;
-			return ( -1 );
+
-		}
 #ifdef DO_SENDMSG
 	/* Send a dummy message with access rights. Remote side will
 	 * obtain our uid/gid by fstat'ing this descriptor.
@@ -211,17 +206,20 @@ sendcred:
 			}
 		}
 #endif
-		return ( 0 );
+		return 0;
 	}
 
-	if ( errno != EINPROGRESS && errno != EWOULDBLOCK ) {
+	if ( errno != EINPROGRESS && errno != EWOULDBLOCK ) return -1;
-		return ( -1 );
-	}
 	
 #ifdef notyet
-	if ( async ) return ( -2 );
+	if ( async ) return -2;
 #endif
 
+#ifdef HAVE_POLL
+		assert(0);
+#else
+	{
+		fd_set		wfds, *z=NULL;
 		FD_ZERO(&wfds);
 		FD_SET(s, &wfds );
 
@@ -233,16 +231,17 @@ sendcred:
 		if( rc == AC_SOCKET_ERROR ) return rc;
 
 		if ( FD_ISSET(s, &wfds) ) {
-		if ( ldap_pvt_is_socket_ready(ld, s) == -1 )
+			if ( ldap_pvt_is_socket_ready(ld, s) == -1 ) return -1;
-			return ( -1 );
+			if ( ldap_pvt_ndelay_off(ld, s) == -1 ) return -1;
-		if ( ldap_pvt_ndelay_off(ld, s) == -1 )
-			return ( -1 );
 #ifdef DO_SENDMSG
 			goto sendcred;
 #else
 			return ( 0 );
 #endif
 		}
+	}
+#endif
+
 	oslocal_debug(ld, "ldap_connect_timeout: timed out\n",0,0,0);
 	ldap_pvt_set_errno( ETIMEDOUT );
 	return ( -1 );

libraries/libldap/request.c

@@ -158,8 +158,7 @@ ldap_send_initial_request(
 int
 ldap_int_flush_request(
 	LDAP *ld,
-	LDAPRequest *lr
+	LDAPRequest *lr )
-)
 {
 	LDAPConn *lc = lr->lr_conn;