upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 16:19:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
It returns (int)0xffffffff on OSF1 which has 64-bit long, so
`unsigned long address; ... if((address = inet_addr(str)) == -1)' fails.
This commit is contained in:
Hallvard Furuseth 1998-11-12 02:24:43 +00:00
parent 523fd2c891
commit ce5dcbc522
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libraries/libldap/cldap.c
View file

@ -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;

7
libraries/libldap/os-ip.c
View file

@ -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;