X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Futil-int.c;h=ffd221408188583f5ed92d32ba69f32e78ef8ad8;hb=c1a257a83f3d8b9565238b5f9b8cad39a6194f63;hp=03547263a4fb9c245d3d98fc92954254b3bddc19;hpb=29d9fa20a2823c827f098d78f1ea8539d86bf4cf;p=openldap diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c index 03547263a4..ffd2214081 100644 --- a/libraries/libldap/util-int.c +++ b/libraries/libldap/util-int.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "ldap-int.h" @@ -58,13 +59,10 @@ # ifndef USE_CTIME_R static ldap_pvt_thread_mutex_t ldap_int_ctime_mutex; # endif -# ifndef HAVE_GETHOSTBYNAME_R - static ldap_pvt_thread_mutex_t ldap_int_gethostbyname_mutex; +# if !defined( HAVE_GETHOSTBYNAME_R ) || !defined( HAVE_GETHOSTBYADDR_R ) + static ldap_pvt_thread_mutex_t ldap_int_gethostby_mutex; # endif -# ifndef HAVE_GETHOSTBYADDR_R - static ldap_pvt_thread_mutex_t ldap_int_gethostbyaddr_mutex; -# endif -# ifdef HAVE_RES_SEARCH +# ifdef HAVE_RES_QUERY ldap_pvt_thread_mutex_t ldap_int_resolv_mutex; # endif #endif /* LDAP_R_COMPILE */ @@ -86,7 +84,7 @@ char *ldap_pvt_ctime( const time_t *tp, char *buf ) # ifdef LDAP_R_COMPILE ldap_pvt_thread_mutex_lock( &ldap_int_ctime_mutex ); # endif - memcpy( buf, ctime(tp), 26 ); + AC_MEMCPY( buf, ctime(tp), 26 ); # ifdef LDAP_R_COMPILE ldap_pvt_thread_mutex_unlock( &ldap_int_ctime_mutex ); # endif @@ -98,7 +96,10 @@ char *ldap_pvt_ctime( const time_t *tp, char *buf ) #define BUFMAX (32*1024) static char *safe_realloc( char **buf, int len ); + +#if !defined(HAVE_GETHOSTBYNAME_R) && defined(LDAP_R_COMPILE) static int copy_hostent( struct hostent *res, char **buf, struct hostent * src ); +#endif int ldap_pvt_gethostbyname_a( const char *name, @@ -145,8 +146,9 @@ int ldap_pvt_gethostbyname_a( # define NEED_COPY_HOSTENT struct hostent *he; int retval; + *buf = NULL; - ldap_pvt_thread_mutex_lock( &ldap_int_gethostbyname_mutex ); + ldap_pvt_thread_mutex_lock( &ldap_int_gethostby_mutex ); he = gethostbyname( name ); @@ -161,10 +163,11 @@ int ldap_pvt_gethostbyname_a( retval = 0; } - ldap_pvt_thread_mutex_unlock( &ldap_int_gethostbyname_mutex ); + ldap_pvt_thread_mutex_unlock( &ldap_int_gethostby_mutex ); return retval; #else + *buf = NULL; *result = gethostbyname( name ); if (*result!=NULL) { @@ -224,8 +227,9 @@ int ldap_pvt_gethostbyaddr_a( # define NEED_COPY_HOSTENT struct hostent *he; int retval; + *buf = NULL; - ldap_pvt_thread_mutex_lock( &ldap_int_gethostbyaddr_mutex ); + ldap_pvt_thread_mutex_lock( &ldap_int_gethostby_mutex ); he = gethostbyaddr( addr, len, type ); @@ -240,10 +244,11 @@ int ldap_pvt_gethostbyaddr_a( retval = 0; } - ldap_pvt_thread_mutex_unlock( &ldap_int_gethostbyaddr_mutex ); + ldap_pvt_thread_mutex_unlock( &ldap_int_gethostby_mutex ); return retval; #else /* gethostbyaddr() */ + *buf = NULL; *result = gethostbyaddr( addr, len, type ); if (*result!=NULL) { @@ -269,15 +274,11 @@ void ldap_int_utils_init( void ) ldap_pvt_thread_mutex_init( &ldap_int_ctime_mutex ); #endif -#if !defined( HAVE_GETHOSTBYNAME_R ) - ldap_pvt_thread_mutex_init( &ldap_int_gethostbyname_mutex ); -#endif - -#if !defined( HAVE_GETHOSTBYADDR_R ) - ldap_pvt_thread_mutex_init( &ldap_int_gethostbyaddr_mutex ); +#if !defined( HAVE_GETHOSTBYNAME_R ) || !defined( HAVE_GETHOSTBYADDR_R ) + ldap_pvt_thread_mutex_init( &ldap_int_gethostby_mutex ); #endif -#ifdef HAVE_RES_SEARCH +#ifdef HAVE_RES_QUERY ldap_pvt_thread_mutex_init( &ldap_int_resolv_mutex ); #endif @@ -295,7 +296,7 @@ static char *cpy_aliases( char ***tgtio, char *buf, char **src ) char **tgt=*tgtio; for( ; (*src) ; src++ ) { len = strlen( *src ) + 1; - memcpy( buf, *src, len ); + AC_MEMCPY( buf, *src, len ); *tgt++=buf; buf+=len; } @@ -307,7 +308,7 @@ static char *cpy_addresses( char ***tgtio, char *buf, char **src, int len ) { char **tgt=*tgtio; for( ; (*src) ; src++ ) { - memcpy( buf, *src, len ); + AC_MEMCPY( buf, *src, len ); *tgt++=buf; buf+=len; } @@ -350,9 +351,9 @@ static int copy_hostent( struct hostent *res, char **buf, struct hostent * src ) if (safe_realloc( buf, total_len )) { tp = (char **) *buf; tbuf = *buf + (n_alias + n_addr + 2) * sizeof( char * ); - memcpy( res, src, sizeof( struct hostent ) ); + AC_MEMCPY( res, src, sizeof( struct hostent ) ); /* first the name... */ - memcpy( tbuf, src->h_name, name_len ); + AC_MEMCPY( tbuf, src->h_name, name_len ); res->h_name = tbuf; tbuf+=name_len; /* now the aliases */ res->h_aliases = tp; @@ -384,4 +385,67 @@ static char *safe_realloc( char **buf, int len ) } #endif +char * ldap_pvt_get_fqdn( char *name ) +{ + char *fqdn, *ha_buf; + char hostbuf[MAXHOSTNAMELEN+1]; + struct hostent *hp, he_buf; + int rc, local_h_errno; + + if( name == NULL ) { + if( gethostname( hostbuf, MAXHOSTNAMELEN ) == 0 ) { + hostbuf[MAXHOSTNAMELEN] = '\0'; + name = hostbuf; + } else { + name = "localhost"; + } + } + + rc = ldap_pvt_gethostbyname_a( name, + &he_buf, &ha_buf, &hp, &local_h_errno ); + + if( rc < 0 || hp == NULL || hp->h_name == NULL ) { + fqdn = LDAP_STRDUP( name ); + } else { + fqdn = LDAP_STRDUP( hp->h_name ); + } + + LDAP_FREE( ha_buf ); + return fqdn; +} +#if defined( HAVE_GETADDRINFO ) && !defined( HAVE_GAI_STRERROR ) +char *ldap_pvt_gai_strerror (int code) { + static struct { + int code; + const char *msg; + } values[] = { +#ifdef EAI_ADDRFAMILY + { EAI_ADDRFAMILY, "Address family for hostname not supported" }, +#endif + { EAI_AGAIN, "Temporary failure in name resolution" }, + { EAI_BADFLAGS, "Bad value for ai_flags" }, + { EAI_FAIL, "Non-recoverable failure in name resolution" }, + { EAI_FAMILY, "ai_family not supported" }, + { EAI_MEMORY, "Memory allocation failure" }, +#ifdef EAI_NODATA + { EAI_NODATA, "No address associated with hostname" }, +#endif + { EAI_NONAME, "Name or service not known" }, + { EAI_SERVICE, "Servname not supported for ai_socktype" }, + { EAI_SOCKTYPE, "ai_socktype not supported" }, + { EAI_SYSTEM, "System error" }, + { 0, NULL } + }; + + int i; + + for ( i = 0; values[i].msg != NULL; i++ ) { + if ( values[i].code == code ) { + return (char *) values[i].msg; + } + } + + return "Unknown error"; +} +#endif