LDAP C-API changes

[openldap] / libraries / libldap / os-ip.c

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 7105dc1c776d56ebc0764243cdd714c08abe348b..46ab3a6d5aafc5abd37224144255bb6db541b475 100644 (file)
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -26,8 +26,6 @@
 #include <sys/ioctl.h>
 #endif
 
-#include "lber.h"
-#include "ldap.h"
 #include "ldap-int.h"
 
 int
@@ -37,7 +35,7 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address,
  * if host == NULL, connect using address
  * "address" and "port" must be in network byte order
  * zero is returned upon success, -1 if fatal error, -2 EINPROGRESS
- * async is only used ifdef LDAP_REFERRALS (non-0 means don't wait for connect)
+ * async is only used ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS (non-0 means don't wait for connect)
  * XXX async is not used yet!
  */
 {
@@ -46,37 +44,54 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address,
        struct sockaddr_in      sin;
        struct hostent          *hp = NULL;
 #ifdef notyet
-#ifdef LDAP_REFERRALS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
        int                     status; /* for ioctl call */
-#endif /* LDAP_REFERRALS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 #endif /* notyet */
-
+   
+       /* buffers for ldap_int_gethostbyname_a */
+       struct hostent          he_buf;
+       int                     local_h_errno;
+       char                    *ha_buf=NULL;
+#define DO_RETURN(x) if (ha_buf) free(ha_buf); return (x);
+   
        Debug( LDAP_DEBUG_TRACE, "ldap_connect_to_host: %s:%d\n",
            ( host == NULL ) ? "(by address)" : host, (int) ntohs( (short) port ), 0 );
 
        connected = use_hp = 0;
 
-       if ( host != NULL && ( address = inet_addr( host )) == -1 ) {
-               if ( (hp = gethostbyname( host )) == NULL ) {
+       if ( host != NULL ) {
+           address = inet_addr( host );
+           /* This was just a test for -1 until OSF1 let inet_addr return
+              unsigned int, which is narrower than 'unsigned long address' */
+           if ( address == 0xffffffff || address == (unsigned long) -1 ) {
+               if ( ( ldap_int_gethostbyname_a( host, &he_buf, &ha_buf,
+                       &hp, &local_h_errno) < 0) || (hp==NULL))
+               {
+#ifdef HAVE_WINSOCK
+                       errno = WSAGetLastError();
+#else
                        errno = EHOSTUNREACH;   /* not exactly right, but... */
-                       return( -1 );
+#endif
+                       DO_RETURN( -1 );
                }
                use_hp = 1;
+           }
        }
 
        rc = -1;
        for ( i = 0; !use_hp || ( hp->h_addr_list[ i ] != 0 ); i++ ) {
                if (( s = socket( AF_INET, SOCK_STREAM, 0 )) < 0 ) {
-                       return( -1 );
+                       DO_RETURN( -1 );
                }
 #ifdef notyet
-#ifdef LDAP_REFERRALS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
                status = 1;
                if ( async && ioctl( s, FIONBIO, (caddr_t)&status ) == -1 ) {
                        Debug( LDAP_DEBUG_ANY, "FIONBIO ioctl failed on %d\n",
                            s, 0, 0 );
                }
-#endif /* LDAP_REFERRALS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 #endif /* notyet */
                (void)memset( (char *)&sin, 0, sizeof( struct sockaddr_in ));
                sin.sin_family = AF_INET;
@@ -91,8 +106,11 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address,
                        rc = 0;
                        break;
                } else {
+#ifdef HAVE_WINSOCK
+                       errno = WSAGetLastError();
+#endif
 #ifdef notyet
-#ifdef LDAP_REFERRALS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
 #ifdef EAGAIN
                        if ( errno == EINPROGRESS || errno == EAGAIN ) {
 #else /* EAGAIN */
@@ -103,7 +121,7 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address,
                                rc = -2;
                                break;
                        }
-#endif /* LDAP_REFERRALS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 #endif /* notyet */
 
 #ifdef LDAP_DEBUG              
@@ -111,7 +129,7 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address,
                                perror( (char *)inet_ntoa( sin.sin_addr ));
                        }
 #endif
-                       close( s );
+                       tcp_close( s );
                        if ( !use_hp ) {
                                break;
                        }
@@ -122,21 +140,25 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address,
 
        if ( connected ) {
 #ifdef notyet
-#ifdef LDAP_REFERRALS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
                status = 0;
                if ( !async && ioctl( s, FIONBIO, (caddr_t)&on ) == -1 ) {
                        Debug( LDAP_DEBUG_ANY, "FIONBIO ioctl failed on %d\n",
                            s, 0, 0 );
                }
-#endif /* LDAP_REFERRALS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */
 #endif /* notyet */
 
                Debug( LDAP_DEBUG_TRACE, "sd %d connected to: %s\n",
-                   s, inet_ntoa( sin.sin_addr ), 0 );
+                   s, (char *) inet_ntoa( sin.sin_addr ), 0 );
        }
 
-       return( rc );
+       DO_RETURN( rc );
+       
+       
 }
+   
+#undef DO_RETURN
 
 
 void
@@ -155,6 +177,12 @@ ldap_host_connected_to( Sockbuf *sb )
        int                     len;
        struct sockaddr_in      sin;
 
+       /* buffers for gethostbyaddr_r */
+       struct hostent          he_buf;
+        int                    local_h_errno;
+       char                    *ha_buf=NULL;
+#define DO_RETURN(x) if (ha_buf) free(ha_buf); return (x);
+   
        (void)memset( (char *)&sin, 0, sizeof( struct sockaddr_in ));
        len = sizeof( sin );
        if ( getpeername( sb->sb_sd, (struct sockaddr *)&sin, &len ) == -1 ) {
@@ -166,19 +194,24 @@ 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 (( hp = gethostbyaddr( (char *) &sin.sin_addr,
-           sizeof( sin.sin_addr ), AF_INET )) != NULL ) {
+       if ((ldap_int_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 ) {
-                       return( strdup( hp->h_name ));
+                       DO_RETURN( ldap_strdup( hp->h_name ));
                }
        }
 
-       return( NULL );
+       DO_RETURN( NULL );
 }
+#undef DO_RETURN   
+   
 #endif /* HAVE_KERBEROS */
 
 
-#ifdef LDAP_REFERRALS
+#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS
 /* for UNIX */
 struct selectinfo {
        fd_set  si_readfds;
@@ -249,7 +282,7 @@ ldap_is_read_ready( LDAP *ld, Sockbuf *sb )
 
 
 void *
-ldap_new_select_info()
+ldap_new_select_info( void )
 {
        struct selectinfo       *sip;
 
@@ -283,6 +316,8 @@ do_ldap_select( LDAP *ld, struct timeval *timeout )
                tblsize = sysconf( _SC_OPEN_MAX );
 #elif defined( HAVE_GETDTABLESIZE )
                tblsize = getdtablesize();
+#else
+               tblsize = FD_SETSIZE;
 #endif /* !USE_SYSCONF */
 
 #ifdef FD_SETSIZE
@@ -299,4 +334,4 @@ do_ldap_select( LDAP *ld, struct timeval *timeout )
        return( select( tblsize, &sip->si_use_readfds, &sip->si_use_writefds,
            NULL, timeout ));
 }
-#endif /* LDAP_REFERRALS */
+#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS */