X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=inline;f=libraries%2Flibldap%2Fos-ip.c;h=4854e5c75e640c4ea7ef530d8514165cb91e702e;hb=cf6a9d9d0f0b2bcacab72a87531df5df56ca08ef;hp=1033d62c526632c69f4372e62a8ca8ce38f60f20;hpb=29d9fa20a2823c827f098d78f1ea8539d86bf4cf;p=openldap

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 1033d62c52..4854e5c75e 100644
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*  Portions
@@ -30,6 +30,14 @@
 
 int ldap_int_tblsize = 0;
 
+#if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP )
+#  ifdef LDAP_PF_INET6
+int ldap_int_inet4or6 = AF_UNSPEC;
+#  else
+int ldap_int_inet4or6 = AF_INET;
+#  endif
+#endif
+
 /*
  * nonblock connect code
  * written by Lars Uffmann, <lars.uffmann@mediaway.net>.
@@ -67,14 +75,14 @@ ldap_int_timeval_dup( struct timeval **dest, const struct timeval *src )
 		return 0;
 	}
 
-	new = (struct timeval *) malloc(sizeof(struct timeval));
+	new = (struct timeval *) LDAP_MALLOC(sizeof(struct timeval));
 
 	if( new == NULL ) {
 		*dest = NULL;
 		return 1;
 	}
 
-	SAFEMEMCPY( (char *) new, (const char *) src, sizeof(struct timeval));
+	AC_MEMCPY( (char *) new, (const char *) src, sizeof(struct timeval));
 
 	*dest = new;
 	return 0;
@@ -95,9 +103,9 @@ ldap_pvt_ndelay_off(LDAP *ld, int fd)
 }
 
 static ber_socket_t
-ldap_pvt_socket(LDAP *ld)
+ldap_int_socket(LDAP *ld, int family, int type )
 {
-	ber_socket_t s = socket(AF_INET, SOCK_STREAM, 0);
+	ber_socket_t s = socket(family, type, 0);
 	osip_debug(ld, "ldap_new_socket: %d\n",s,0,0);
 	return ( s );
 }
@@ -110,25 +118,28 @@ ldap_pvt_close_socket(LDAP *ld, int s)
 }
 
 static int
-ldap_pvt_prepare_socket(LDAP *ld, int fd)
+ldap_int_prepare_socket(LDAP *ld, int s, int proto )
 {
-	osip_debug(ld, "ldap_prepare_socket: %d\n",fd,0,0);
+	osip_debug(ld, "ldap_prepare_socket: %d\n", s,0,0);
 
 #ifdef TCP_NODELAY
-{
-	int dummy = 1;
-	if ( setsockopt( fd, IPPROTO_TCP, TCP_NODELAY,
-		(char*) &dummy, sizeof(dummy) ) == AC_SOCKET_ERROR )
-	{
-		osip_debug(ld, "ldap_prepare_socket: "
-			"setsockopt(%d, TCP_NODELAY) failed (ignored).\n",
-			fd, 0, 0);
+	if( proto == LDAP_PROTO_TCP ) {
+		int dummy = 1;
+		if ( setsockopt( s, IPPROTO_TCP, TCP_NODELAY,
+			(char*) &dummy, sizeof(dummy) ) == AC_SOCKET_ERROR )
+		{
+			osip_debug(ld, "ldap_prepare_socket: "
+				"setsockopt(%d, TCP_NODELAY) failed (ignored).\n",
+				s, 0, 0);
+		}
 	}
-}
 #endif
+
 	return 0;
 }
 
+#ifndef HAVE_WINSOCK
+
 #undef TRACE
 #define TRACE do { \
 	osip_debug(ld, \
@@ -149,8 +160,10 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
 #if defined( notyet ) /* && defined( SO_ERROR ) */
 {
 	int so_errno;
-	int dummy = sizeof(so_errno);
-	if ( getsockopt( s, SOL_SOCKET, SO_ERROR, &so_errno, &dummy ) == -1 ) {
+	socklen_t dummy = sizeof(so_errno);
+	if ( getsockopt( s, SOL_SOCKET, SO_ERROR, &so_errno, &dummy )
+		== AC_SOCKET_ERROR )
+	{
 		return -1;
 	}
 	if ( so_errno ) {
@@ -163,15 +176,18 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
 #else
 {
 	/* error slippery */
+#ifdef LDAP_PF_INET6
+	struct sockaddr_storage sin;
+#else
 	struct sockaddr_in sin;
+#endif
 	char ch;
-	int dummy = sizeof(sin);
-	if ( getpeername( s, (struct sockaddr *) &sin, &dummy ) == -1 ) {
+	socklen_t dummy = sizeof(sin);
+	if ( getpeername( s, (struct sockaddr *) &sin, &dummy )
+		== AC_SOCKET_ERROR )
+	{
 		/* XXX: needs to be replace with ber_stream_read() */
 		read(s, &ch, 1);
-#ifdef HAVE_WINSOCK
-		ldap_pvt_set_errno( WSAGetLastError() );
-#endif
 		TRACE;
 		return -1;
 	}
@@ -182,15 +198,32 @@ ldap_pvt_is_socket_ready(LDAP *ld, int s)
 }
 #undef TRACE
 
+#endif /* HAVE_WINSOCK */
+
 static int
-ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_in *sin, int async)
+ldap_pvt_connect(LDAP *ld, ber_socket_t s,
+	struct sockaddr *sin, socklen_t addrlen,
+	int async)
 {
+	int rc;
 	struct timeval	tv, *opt_tv=NULL;
 	fd_set		wfds, *z=NULL;
 #ifdef HAVE_WINSOCK
 	fd_set		efds;
 #endif
 
+#ifdef LDAP_CONNECTIONLESS
+	/* We could do a connect() but that would interfere with
+	 * attempts to poll a broadcast address
+	 */
+	if (LDAP_IS_UDP(ld)) {
+		if (ld->ld_options.ldo_peer)
+			ldap_memfree(ld->ld_options.ldo_peer);
+		ld->ld_options.ldo_peer=ldap_memalloc(sizeof(struct sockaddr));
+		AC_MEMCPY(ld->ld_options.ldo_peer,sin,sizeof(struct sockaddr));
+		return ( 0 );
+	}
+#endif
 	if ( (opt_tv = ld->ld_options.ldo_tm_net) != NULL ) {
 		tv.tv_usec = opt_tv->tv_usec;
 		tv.tv_sec = opt_tv->tv_sec;
@@ -202,8 +235,7 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_in *sin, int async)
 	if ( ldap_pvt_ndelay_on(ld, s) == -1 )
 		return ( -1 );
 
-	if ( connect(s, (struct sockaddr *) sin, sizeof(struct sockaddr_in)) == 0 )
-	{
+	if ( connect(s, sin, addrlen) != AC_SOCKET_ERROR ) {
 		if ( ldap_pvt_ndelay_off(ld, s) == -1 )
 			return ( -1 );
 		return ( 0 );
@@ -229,28 +261,41 @@ ldap_pvt_connect(LDAP *ld, ber_socket_t s, struct sockaddr_in *sin, int async)
 	FD_SET(s, &efds );
 #endif
 
-	if ( select(ldap_int_tblsize, z, &wfds,
+	do {
+		rc = select(ldap_int_tblsize, z, &wfds,
 #ifdef HAVE_WINSOCK
-		    &efds,
+			&efds,
 #else
-		    z,
+			z,
 #endif
-		    opt_tv ? &tv : NULL) == -1)
-		return ( -1 );
+			opt_tv ? &tv : NULL);
+	} while( rc == AC_SOCKET_ERROR && errno == EINTR &&
+		LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_RESTART ));
+
+	if( rc == AC_SOCKET_ERROR ) return rc;
 
 #ifdef HAVE_WINSOCK
 	/* This means the connection failed */
-	if (FD_ISSET(s, &efds))
-	{
-	    ldap_pvt_set_errno(WSAECONNREFUSED);
+	if ( FD_ISSET(s, &efds) ) {
+	    int so_errno;
+	    int dummy = sizeof(so_errno);
+	    if ( getsockopt( s, SOL_SOCKET, SO_ERROR,
+			(char *) &so_errno, &dummy ) == AC_SOCKET_ERROR || !so_errno )
+	    {
+	    	/* impossible */
+	    	so_errno = WSAGetLastError();
+	    }
+	    ldap_pvt_set_errno(so_errno);
 	    osip_debug(ld, "ldap_pvt_connect: error on socket %d: "
 		       "errno: %d (%s)\n", s, errno, sock_errstr(errno));
 	    return -1;
 	}
 #endif
 	if ( FD_ISSET(s, &wfds) ) {
+#ifndef HAVE_WINSOCK
 		if ( ldap_pvt_is_socket_ready(ld, s) == -1 )
 			return ( -1 );
+#endif
 		if ( ldap_pvt_ndelay_off(ld, s) == -1 )
 			return ( -1 );
 		return ( 0 );
@@ -275,27 +320,119 @@ ldap_pvt_inet_aton( const char *host, struct in_addr *in)
 
 
 int
-ldap_connect_to_host(LDAP *ld, Sockbuf *sb, const char *host,
-		unsigned long address, int port, int async)
+ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
+	int proto,
+	const char *host,
+	unsigned long address, int port, int async )
 {
-	struct sockaddr_in	sin;
-	struct in_addr		in;
 	ber_socket_t		s = AC_SOCKET_INVALID;
 	int			rc, i, use_hp = 0;
-	struct hostent		*hp, he_buf;
-   	int			local_h_errno;
+	struct hostent		*hp = NULL;
 	char   			*ha_buf=NULL, *p, *q;
+	int			socktype;
 
-	osip_debug(ld, "ldap_connect_to_host\n",0,0,0);
 	
+	switch(proto) {
+	case LDAP_PROTO_TCP: socktype = SOCK_STREAM;
+		osip_debug(ld, "ldap_connect_to_host: TCP %s:%d\n",host,port,0);
+		break;
+	case LDAP_PROTO_UDP: socktype = SOCK_DGRAM;
+		osip_debug(ld, "ldap_connect_to_host: TCP %s:%d\n",host,port,0);
+		break;
+
+	default:
+		osip_debug(ld, "ldap_connect_to_host: unknown proto: %d\n",
+			proto, 0, 0);
+		return -1;
+	}
+
 	if (host != NULL) {
+#if defined( HAVE_GETADDRINFO ) && defined( HAVE_INET_NTOP )
+		char serv[7];
+		int err;
+		struct addrinfo hints, *res, *sai;
+
+		memset( &hints, '\0', sizeof(hints) );
+		hints.ai_family = ldap_int_inet4or6;
+		hints.ai_socktype = socktype;
+
+		snprintf(serv, sizeof serv, "%d", port );
+
+#ifdef LDAP_R_COMPILE
+		/* most getaddrinfo(3) use non-threadsafe resolver libraries */
+		ldap_pvt_thread_mutex_lock(&ldap_int_resolv_mutex);
+#endif
+
+		err = getaddrinfo( host, serv, &hints, &res );
+
+#ifdef LDAP_R_COMPILE
+		ldap_pvt_thread_mutex_unlock(&ldap_int_resolv_mutex);
+#endif
+
+		if ( err != 0 ) {
+			osip_debug(ld, "ldap_connect_to_host: getaddrinfo failed: %s\n",
+				AC_GAI_STRERROR(err), 0, 0);
+			return -1;
+		}
+		rc = -1;
+
+		for( sai=res; sai != NULL; sai=sai->ai_next) {
+			if( sai->ai_addr == NULL ) {
+				osip_debug(ld, "ldap_connect_to_host: getaddrinfo "
+					"ai_addr is NULL?\n", 0, 0, 0);
+				continue;
+			}
+
+			/* we assume AF_x and PF_x are equal for all x */
+			s = ldap_int_socket( ld, sai->ai_family, socktype );
+			if ( s == AC_SOCKET_INVALID ) {
+				continue;
+			}
+
+			if ( ldap_int_prepare_socket(ld, s, proto ) == -1 ) {
+				ldap_pvt_close_socket(ld, s);
+				break;
+			}
+
+			switch (sai->ai_family) {
+#ifdef LDAP_PF_INET6
+			case AF_INET6: {
+				char addr[INET6_ADDRSTRLEN];
+				inet_ntop( AF_INET6,
+					&((struct sockaddr_in6 *)sai->ai_addr)->sin6_addr,
+					addr, sizeof addr);
+				osip_debug(ld, "ldap_connect_to_host: Trying %s %s\n", 
+					addr, serv, 0);
+			} break;
+#endif
+			case AF_INET: {
+				char addr[INET_ADDRSTRLEN];
+				inet_ntop( AF_INET,
+					&((struct sockaddr_in *)sai->ai_addr)->sin_addr,
+					addr, sizeof addr);
+				osip_debug(ld, "ldap_connect_to_host: Trying %s:%s\n", 
+					addr, serv, 0);
+			} break;
+			}
+
+			rc = ldap_pvt_connect(ld, s, sai->ai_addr, sai->ai_addrlen, async);
+			if ( (rc == 0) || (rc == -2) ) {
+				ber_sockbuf_ctrl( sb, LBER_SB_OPT_SET_FD, &s );
+				break;
+			}
+			ldap_pvt_close_socket(ld, s);
+		}
+		freeaddrinfo(res);
+		return rc;
+
+#else
+		struct in_addr in;
 		if (! inet_aton( host, &in) ) {
+			int local_h_errno;
+			struct hostent he_buf;
 			rc = ldap_pvt_gethostbyname_a(host, &he_buf, &ha_buf,
 					&hp, &local_h_errno);
 
-			if ( rc < 0 )
-				; /*XXX NO MEMORY? */
-
 			if ( (rc < 0) || (hp == NULL) ) {
 #ifdef HAVE_WINSOCK
 				ldap_pvt_set_errno( WSAGetLastError() );
@@ -309,35 +446,40 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb, const char *host,
 			use_hp = 1;
 		}
 		address = in.s_addr;
+#endif
 	}
 
 	rc = s = -1;
 	for ( i = 0; !use_hp || (hp->h_addr_list[i] != 0); ++i, rc = -1 ) {
+		struct sockaddr_in	sin;
 
-		if ( (s = ldap_pvt_socket( ld )) == -1 )
+		s = ldap_int_socket( ld, PF_INET, socktype );
+		if ( s == AC_SOCKET_INVALID ) {
 			/* use_hp ? continue : break; */
 			break;
+		}
 	   
-		if ( ldap_pvt_prepare_socket(ld, s) == -1 ) {
+		if ( ldap_int_prepare_socket( ld, s, proto ) == -1 ) {
 			ldap_pvt_close_socket(ld, s);
-			/* use_hp ? continue : break; */
 			break;
 		}
 
-		(void)memset((char *)&sin, 0, sizeof(struct sockaddr_in));
+		(void)memset((char *)&sin, '\0', sizeof sin);
 		sin.sin_family = AF_INET;
-		sin.sin_port = port;
+		sin.sin_port = htons((short) port);
 		p = (char *)&sin.sin_addr;
 		q = use_hp ? (char *)hp->h_addr_list[i] : (char *)&address;
-		SAFEMEMCPY(p, q, sizeof(sin.sin_addr) );
+		AC_MEMCPY(p, q, sizeof(sin.sin_addr) );
 
 		osip_debug(ld, "ldap_connect_to_host: Trying %s:%d\n", 
-				inet_ntoa(sin.sin_addr),ntohs(sin.sin_port),0);
+			inet_ntoa(sin.sin_addr),port,0);
 
-		rc = ldap_pvt_connect(ld, s, &sin, async);
+		rc = ldap_pvt_connect(ld, s,
+			(struct sockaddr *)&sin, sizeof(struct sockaddr_in),
+			async);
    
 		if ( (rc == 0) || (rc == -2) ) {
-			ber_pvt_sb_set_desc( sb, s );
+			ber_sockbuf_ctrl( sb, LBER_SB_OPT_SET_FD, &s );
 			break;
 		}
 
@@ -350,31 +492,33 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb, const char *host,
 	return rc;
 }
 
-void
-ldap_close_connection( Sockbuf *sb )
-{
-	ber_pvt_sb_close( sb );
-}
-
-
-#if defined( LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND ) || defined( HAVE_TLS ) || defined( HAVE_CYRUS_SASL )
+#if defined( LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND ) || \
+	defined( HAVE_CYRUS_SASL )
 char *
 ldap_host_connected_to( Sockbuf *sb )
 {
-	struct hostent		*hp;
-	socklen_t         	len;
-	struct sockaddr_in	sin;
+	struct hostent	*hp;
+	socklen_t		len;
+#ifdef LDAP_PF_INET6
+	struct sockaddr_storage sabuf;
+#else
+	struct sockaddr sabuf;
+#endif
+	struct sockaddr	*sa = (struct sockaddr *) &sabuf;
+	char			*addr;
+	char			*host;
 
    	/* buffers for gethostbyaddr_r */
-   	struct hostent		he_buf;
-        int			local_h_errno;
+   	struct hostent	he_buf;
+	int				local_h_errno;
    	char			*ha_buf=NULL;
-#define DO_RETURN(x) if (ha_buf) LDAP_FREE(ha_buf); return (x);
-   
-	(void)memset( (char *)&sin, 0, sizeof( struct sockaddr_in ));
-	len = sizeof( sin );
+	ber_socket_t	sd;
+
+	(void)memset( (char *)sa, '\0', sizeof sabuf );
+	len = sizeof sabuf;
 
-	if ( getpeername( ber_pvt_sb_get_desc(sb), (struct sockaddr *)&sin, &len ) == -1 ) {
+	ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd );
+	if ( getpeername( sd, sa, &len ) == -1 ) {
 		return( NULL );
 	}
 
@@ -383,22 +527,63 @@ ldap_host_connected_to( Sockbuf *sb )
 	 * this is necessary for kerberos to work right, since the official
 	 * hostname is used as the kerberos instance.
 	 */
-	if ((ldap_pvt_gethostbyaddr_a( (char *) &sin.sin_addr,
-		sizeof( sin.sin_addr ), 
-		AF_INET, &he_buf, &ha_buf,
-		&hp,&local_h_errno ) ==0 ) && (hp != NULL) )
-	{
-		if ( hp->h_name != NULL ) {
-			char *host = LDAP_STRDUP( hp->h_name );   
-			DO_RETURN( host );
+
+	switch (sa->sa_family) {
+#ifdef LDAP_PF_LOCAL
+	case AF_LOCAL:
+		return LDAP_STRDUP( ldap_int_hostname );
+#endif
+#ifdef LDAP_PF_INET6
+	case AF_INET6:
+		addr = (char *) &((struct sockaddr_in6 *)sa)->sin6_addr;
+		len = sizeof( struct in6_addr );
+		break;
+#endif
+	case AF_INET:
+		addr = (char *) &((struct sockaddr_in *)sa)->sin_addr;
+		len = sizeof( struct in_addr );
+
+		{
+			struct sockaddr_in localhost;
+			localhost.sin_addr.s_addr = htonl( INADDR_ANY );
+
+			if( memcmp ( &localhost.sin_addr,
+				&((struct sockaddr_in *)sa)->sin_addr,
+				sizeof(localhost.sin_addr) ) == 0 )
+			{
+				return LDAP_STRDUP( ldap_int_hostname );
+			}
+
+#ifdef INADDR_LOOPBACK
+			localhost.sin_addr.s_addr = htonl( INADDR_LOOPBACK );
+
+			if( memcmp ( &localhost.sin_addr,
+				&((struct sockaddr_in *)sa)->sin_addr,
+				sizeof(localhost.sin_addr) ) == 0 )
+			{
+				return LDAP_STRDUP( ldap_int_hostname );
+			}
+#endif
 		}
+		break;
+
+	default:
+		return( NULL );
+		break;
+	}
+
+	host = NULL;
+	if ((ldap_pvt_gethostbyaddr_a( addr, len, sa->sa_family,
+		&he_buf, &ha_buf, &hp, &local_h_errno ) == 0 ) &&
+		(hp != NULL) && ( hp->h_name != NULL ) )
+	{
+		host = LDAP_STRDUP( hp->h_name );   
 	}
 
-	DO_RETURN( NULL );
+	LDAP_FREE( ha_buf );
+	return host;
 }
-#undef DO_RETURN   
-   
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND || HAVE_TLS */
+#endif
 
 
 /* for UNIX */
@@ -414,11 +599,13 @@ void
 ldap_mark_select_write( LDAP *ld, Sockbuf *sb )
 {
 	struct selectinfo	*sip;
+	ber_socket_t		sd;
 
 	sip = (struct selectinfo *)ld->ld_selectinfo;
 	
-	if ( !FD_ISSET( ber_pvt_sb_get_desc(sb), &sip->si_writefds )) {
-		FD_SET( (u_int) sb->sb_sd, &sip->si_writefds );
+	ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd );
+	if ( !FD_ISSET( sd, &sip->si_writefds )) {
+		FD_SET( sd, &sip->si_writefds );
 	}
 }
 
@@ -427,11 +614,13 @@ void
 ldap_mark_select_read( LDAP *ld, Sockbuf *sb )
 {
 	struct selectinfo	*sip;
+	ber_socket_t		sd;
 
 	sip = (struct selectinfo *)ld->ld_selectinfo;
 
-	if ( !FD_ISSET( ber_pvt_sb_get_desc(sb), &sip->si_readfds )) {
-		FD_SET( (u_int) sb->sb_sd, &sip->si_readfds );
+	ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd );
+	if ( !FD_ISSET( sd, &sip->si_readfds )) {
+		FD_SET( sd, &sip->si_readfds );
 	}
 }
 
@@ -440,11 +629,13 @@ void
 ldap_mark_select_clear( LDAP *ld, Sockbuf *sb )
 {
 	struct selectinfo	*sip;
+	ber_socket_t		sd;
 
 	sip = (struct selectinfo *)ld->ld_selectinfo;
 
-	FD_CLR( (u_int) ber_pvt_sb_get_desc(sb), &sip->si_writefds );
-	FD_CLR( (u_int) ber_pvt_sb_get_desc(sb), &sip->si_readfds );
+	ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd );
+	FD_CLR( sd, &sip->si_writefds );
+	FD_CLR( sd, &sip->si_readfds );
 }
 
 
@@ -452,10 +643,12 @@ int
 ldap_is_write_ready( LDAP *ld, Sockbuf *sb )
 {
 	struct selectinfo	*sip;
+	ber_socket_t		sd;
 
 	sip = (struct selectinfo *)ld->ld_selectinfo;
 
-	return( FD_ISSET( ber_pvt_sb_get_desc(sb), &sip->si_use_writefds ));
+	ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd );
+	return( FD_ISSET( sd, &sip->si_use_writefds ));
 }
 
 
@@ -463,10 +656,12 @@ int
 ldap_is_read_ready( LDAP *ld, Sockbuf *sb )
 {
 	struct selectinfo	*sip;
+	ber_socket_t		sd;
 
 	sip = (struct selectinfo *)ld->ld_selectinfo;
 
-	return( FD_ISSET( ber_pvt_sb_get_desc(sb), &sip->si_use_readfds ));
+	ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd );
+	return( FD_ISSET( sd, &sip->si_use_readfds ));
 }
 
 
@@ -513,11 +708,15 @@ ldap_int_ip_init( void )
 
 
 int
-do_ldap_select( LDAP *ld, struct timeval *timeout )
+ldap_int_select( LDAP *ld, struct timeval *timeout )
 {
 	struct selectinfo	*sip;
 
-	Debug( LDAP_DEBUG_TRACE, "do_ldap_select\n", 0, 0, 0 );
+#ifdef NEW_LOGGING
+	LDAP_LOG ( CONNECTION, ENTRY, "ldap_int_select\n", 0, 0, 0 );
+#else
+	Debug( LDAP_DEBUG_TRACE, "ldap_int_select\n", 0, 0, 0 );
+#endif
 
 	if ( ldap_int_tblsize == 0 )
 		ldap_int_ip_init();