Whoops.

diff --git a/libraries/libldap/cldap.c b/libraries/libldap/cldap.c
index f319c415b5dec6744bbd3426f8cec86d17d642b6..806a6ce91c83f8b79c7a40535e4700dd1a269ff3 100644 (file)
--- a/libraries/libldap/cldap.c
+++ b/libraries/libldap/cldap.c
@@ -127,7 +127,7 @@ cldap_open( char *host, int port )
                }
            }
 
-               if ( inet_aton( host, &address ) == 0 ) {
+           if ( (address = inet_addr( host )) == -1 ) {
                if ( (hp = gethostbyname( host )) == NULL ) {
                    errno = EHOSTUNREACH;
                    continue;

diff --git a/libraries/libldap/open.c b/libraries/libldap/open.c
index 3d9a7c630cd614ca36209104f5a24d8291d42160..974a45ac04f4bea6f78dfa96b5e66eeafca25eca 100644 (file)
--- a/libraries/libldap/open.c
+++ b/libraries/libldap/open.c
@@ -64,20 +64,9 @@ ldap_open( char *host, int port )
 #ifdef LDAP_REFERRALS
        LDAPServer      *srv;
 #endif /* LDAP_REFERRALS */
-#ifdef HAVE_WINSOCK_2
-       WORD wVersionRequested;
-       WSADATA wsaData;
-#endif
 
        Debug( LDAP_DEBUG_TRACE, "ldap_open\n", 0, 0, 0 );
 
-#ifdef HAVE_WINSOCK_2
-       wVersionRequested = MAKEWORD( 2, 0 );
-       if ( WSAStartup( wVersionRequested, &wsadata ) != 0 ) {
-               return( NULL );
-       }
-#endif
-
        if (( ld = ldap_init( host, port )) == NULL ) {
                return( NULL );
        }
@@ -87,9 +76,6 @@ ldap_open( char *host, int port )
            NULL || ( ld->ld_defhost != NULL && ( srv->lsrv_host =
            strdup( ld->ld_defhost )) == NULL )) {
                ldap_ld_free( ld, 0 );
-#ifdef HAVE_WINSOCK_2
-               WSACleanup();
-#endif
                return( NULL );
        }
        srv->lsrv_port = ld->ld_defport;
@@ -98,9 +84,6 @@ ldap_open( char *host, int port )
                if ( ld->ld_defhost != NULL ) free( srv->lsrv_host );
                free( (char *)srv );
                ldap_ld_free( ld, 0 );
-#ifdef HAVE_WINSOCK_2
-               WSACleanup();
-#endif
                return( NULL );
        }
        ++ld->ld_defconn->lconn_refcnt; /* so it never gets closed/freed */
@@ -109,9 +92,6 @@ ldap_open( char *host, int port )
        if ( open_ldap_connection( ld, &ld->ld_sb, ld->ld_defhost,
            ld->ld_defport, &ld->ld_host, 0 ) < 0 ) {
                ldap_ld_free( ld, 0 );
-#ifdef HAVE_WINSOCK_2
-               WSACleanup();
-#endif
                return( NULL );
        }
 #endif /* LDAP_REFERRALS */

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 37112bc959258240231549e6b487d872058ae7b8..cc358ceefc1803e19e1ebb924eaea38023aecdef 100644 (file)
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -96,7 +96,7 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address,
 
        connected = use_hp = 0;
 
-       if ( host != NULL && ( inet_aton( host, &address ) == 0 ) ) {
+       if ( host != NULL && ( address = inet_addr( host )) == -1 ) {
                if ( (hp = gethostbyname( host )) == NULL ) {
                        errno = EHOSTUNREACH;   /* not exactly right, but... */
                        return( -1 );