Check if inet_addr() returns 0xffffffff as well as -1.

It returns (int)0xffffffff on OSF1 which has 64-bit long, so
`unsigned long address; ... if((address = inet_addr(str)) == -1)' fails.

diff --git a/libraries/libldap/cldap.c b/libraries/libldap/cldap.c
index c12859b858ddf9dffe5f906441df2b2ba1eb20dc..9403c090c04089e1d710d53862a89d8bf565753d 100644 (file)
--- a/libraries/libldap/cldap.c
+++ b/libraries/libldap/cldap.c
@@ -105,7 +105,10 @@ cldap_open( char *host, int port )
                }
            }
 
-           if ( (address = inet_addr( host )) == (unsigned long) -1L ) {
+           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 ( (hp = gethostbyname( host )) == NULL ) {
                    errno = EHOSTUNREACH;
                    continue;

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 4642144b20d46cab062319fa5b65d6ac35d99026..56aa3deecf87925452b3819c3088c2d0c966d788 100644 (file)
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -54,7 +54,11 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address,
 
        connected = use_hp = 0;
 
-       if ( host != NULL && ( address = inet_addr( host )) == (unsigned long) -1L ) {
+       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 ( (hp = gethostbyname( host )) == NULL ) {
 #ifdef HAVE_WINSOCK
                        errno = WSAGetLastError();
@@ -64,6 +68,7 @@ ldap_connect_to_host( Sockbuf *sb, char *host, unsigned long address,
                        return( -1 );
                }
                use_hp = 1;
+           }
        }
 
        rc = -1;