VLV clean

[openldap] / libraries / libldap / dnssrv.c

diff --git a/libraries/libldap/dnssrv.c b/libraries/libldap/dnssrv.c
index d9463a073fe9a04bfa4e97adcd7414479c47fb5a..cc193e93582bef587dcfb15c511b60feaf00d18d 100644 (file)
--- a/libraries/libldap/dnssrv.c
+++ b/libraries/libldap/dnssrv.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -41,9 +41,8 @@ int ldap_dn2domain(
        char *domain = NULL;
        char **dn;
 
-       if( dn_in == NULL || domainp == NULL ) {
-               return -1;
-       }
+       assert( dn_in != NULL );
+       assert( domainp != NULL );
 
        dn = ldap_explode_dn( dn_in, 0 );
 
@@ -61,12 +60,15 @@ int ldap_dn2domain(
                        return -3;
                }
 
-#define LDAP_DC "dc="
-#define LDAP_DCOID "0.9.2342.19200300.100.1.25="
 
                if( rdn[1] == NULL ) {
+                       /*
+                        * single-valued RDN
+                        */
                        char *dc;
-                       /* single RDN */
+
+#define LDAP_DC "dc="
+#define LDAP_DCOID "0.9.2342.19200300.100.1.25="
 
                        if( strncasecmp( rdn[0],
                                LDAP_DC, sizeof(LDAP_DC)-1 ) == 0 )
@@ -96,7 +98,7 @@ int ldap_dn2domain(
 
                                ndomain = LDAP_REALLOC( domain,
                                        ( domain == NULL ? 0 : strlen(domain) )
-                                       + strlen(dc) + "." );
+                                       + strlen(dc) + sizeof(".") );
 
                                if( ndomain == NULL ) {
                                        LDAP_FREE( rdn );
@@ -106,19 +108,33 @@ int ldap_dn2domain(
                                        return -5;
                                }
 
+                               if( domain == NULL ) {
+                                       ndomain[0] = '\0';
+                               } else {
+                                       strcat( ndomain, "." );
+                               }
+
                                strcat( ndomain, dc );
-                               strcat( ndomain, "." );
 
                                domain = ndomain;
                                continue;
                        }
                }
 
+               /*
+                * multi-valued RDN or fall thru
+                */
+
                LDAP_VFREE( rdn );
                LDAP_FREE( domain );
                domain = NULL;
        } 
 
+       if( domain != NULL &&  *domain == '\0' ) {
+               LDAP_FREE( domain );
+               domain = NULL;
+       }
+
        *domainp = domain;
        return 0;
 }
@@ -130,12 +146,12 @@ int ldap_domain2dn(
     char *domain, *s, *tok_r, *dn;
     size_t loc;
 
-    if (domain_in == NULL || dnp == NULL) {
-       return LDAP_NO_MEMORY;
-    }
+       assert( domain_in != NULL );
+       assert( dnp != NULL );
+
     domain = LDAP_STRDUP(domain_in);
     if (domain == NULL) {
-       return LDAP_NO_MEMORY;
+               return LDAP_NO_MEMORY;
     }
     dn = NULL;
     loc = 0;
@@ -177,25 +193,22 @@ int ldap_domain2hostlist(
        LDAP_CONST char *domain,
        char **list )
 {
-#ifdef HAVE_RES_SEARCH
+#ifdef HAVE_RES_QUERY
     char *request;
-    char *dn;
     char *hostlist = NULL;
     int rc, len, cur = 0;
     unsigned char reply[1024];
 
-       if( domain == NULL || *domain == '\0' ) {
-               return LDAP_PARAM_ERROR;
-       }
+       assert( domain != NULL );
+       assert( list != NULL );
 
-       if( list == NULL ) {
+       if( *domain == '\0' ) {
                return LDAP_PARAM_ERROR;
        }
 
     request = LDAP_MALLOC(strlen(domain) + sizeof("_ldap._tcp."));
     if (request == NULL) {
-       rc = LDAP_NO_MEMORY;
-       goto out;
+               return LDAP_NO_MEMORY;
     }
     sprintf(request, "_ldap._tcp.%s", domain);
 
@@ -203,7 +216,8 @@ int ldap_domain2hostlist(
     ldap_pvt_thread_mutex_lock(&ldap_int_resolv_mutex);
 #endif
 
-    len = res_search(request, C_IN, T_SRV, reply, sizeof(reply));
+    rc = LDAP_UNAVAILABLE;
+    len = res_query(request, C_IN, T_SRV, reply, sizeof(reply));
     if (len >= 0) {
        unsigned char *p;
        char host[1024];
@@ -285,5 +299,5 @@ int ldap_domain2hostlist(
     return rc;
 #else
     return LDAP_NOT_SUPPORTED;
-#endif                         /* HAVE_RES_SEARCH */
+#endif /* HAVE_RES_QUERY */
 }