upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9287 use getaddrinfo for ldap_pvt_get_fqdn

Browse source 
If getaddrinfo is available, should use it here
This commit is contained in:
Howard Chu 2020-07-16 21:08:36 +01:00
parent 75ce891a82
commit 24b45f57f2
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libraries/libldap/util-int.c
View file

@ -830,10 +830,15 @@ static char *safe_realloc( char **buf, int len )
char * ldap_pvt_get_fqdn( char *name ) char * ldap_pvt_get_fqdn( char *name )
{ {
char *fqdn, *ha_buf; #ifdef HAVE_GETADDRINFO
char hostbuf[MAXHOSTNAMELEN+1]; struct addrinfo hints, *res;
#else
char *ha_buf;
struct hostent *hp, he_buf; struct hostent *hp, he_buf;
int rc, local_h_errno; int local_h_errno;
#endif
int rc;
char *fqdn, hostbuf[MAXHOSTNAMELEN+1];
if( name == NULL ) { if( name == NULL ) {
if( gethostname( hostbuf, MAXHOSTNAMELEN ) == 0 ) { if( gethostname( hostbuf, MAXHOSTNAMELEN ) == 0 ) {
@ -844,6 +849,22 @@ char * ldap_pvt_get_fqdn( char *name )
} }
} }
#ifdef HAVE_GETADDRINFO
memset( &hints, 0, sizeof( hints ));
hints.ai_family = AF_UNSPEC;
hints.ai_flags = AI_CANONNAME;
LDAP_MUTEX_LOCK( &ldap_int_resolv_mutex );
rc = getaddrinfo( name, NULL, &hints, &res );
LDAP_MUTEX_UNLOCK( &ldap_int_resolv_mutex );
if ( rc == 0 && res->ai_canonname ) {
fqdn = LDAP_STRDUP( res->ai_canonname );
} else {
fqdn = LDAP_STRDUP( name );
}
if ( rc == 0 )
freeaddrinfo( res );
#else
rc = ldap_pvt_gethostbyname_a( name, rc = ldap_pvt_gethostbyname_a( name,
&he_buf, &ha_buf, &hp, &local_h_errno ); &he_buf, &ha_buf, &hp, &local_h_errno );
@ -854,6 +875,7 @@ char * ldap_pvt_get_fqdn( char *name )
} }
LDAP_FREE( ha_buf ); LDAP_FREE( ha_buf );
#endif
return fqdn; return fqdn;
} }