stdlib.h should be included as <ac/stdlib.h>

[openldap] / libraries / libldap / util-int.c

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index 126b573cb20f322d764a5be4c3d10b76c99afaa5..ffd221408188583f5ed92d32ba69f32e78ef8ad8 100644 (file)
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -29,6 +29,7 @@
 #include <ac/socket.h>
 #include <ac/string.h>
 #include <ac/time.h>
+#include <ac/unistd.h>
 
 #include "ldap-int.h"
 
@@ -95,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, 
@@ -142,6 +146,7 @@ int ldap_pvt_gethostbyname_a(
 # define NEED_COPY_HOSTENT   
        struct hostent *he;
        int     retval;
+       *buf = NULL;
        
        ldap_pvt_thread_mutex_lock( &ldap_int_gethostby_mutex );
        
@@ -162,6 +167,7 @@ int ldap_pvt_gethostbyname_a(
        
        return retval;
 #else  
+       *buf = NULL;
        *result = gethostbyname( name );
 
        if (*result!=NULL) {
@@ -221,6 +227,7 @@ int ldap_pvt_gethostbyaddr_a(
 # define NEED_COPY_HOSTENT   
        struct hostent *he;
        int     retval;
+       *buf = NULL;   
        
        ldap_pvt_thread_mutex_lock( &ldap_int_gethostby_mutex );
        
@@ -241,6 +248,7 @@ int ldap_pvt_gethostbyaddr_a(
        
        return retval;   
 #else /* gethostbyaddr() */
+       *buf = NULL;   
        *result = gethostbyaddr( addr, len, type );
 
        if (*result!=NULL) {
@@ -377,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