Merge branch 'mdb.master' of ssh://git-master.openldap.org/~git/git/openldap

[openldap] / libraries / libldap / dnssrv.c

diff --git a/libraries/libldap/dnssrv.c b/libraries/libldap/dnssrv.c
index 66d977bd99c0910e8a53f696ba22899413bb384c..16b15447cac2bfefc717104998aa5b065cb6fb87 100644 (file)
--- a/libraries/libldap/dnssrv.c
+++ b/libraries/libldap/dnssrv.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@ int ldap_dn2domain(
        LDAPDN dn = NULL;
        LDAPRDN rdn = NULL;
        LDAPAVA *ava = NULL;
-       struct berval domain = { 0, NULL };
+       struct berval domain = BER_BVNULL;
        static const struct berval DC = BER_BVC("DC");
        static const struct berval DCOID = BER_BVC("0.9.2342.19200300.100.1.25");
 
@@ -69,7 +69,7 @@ int ldap_dn2domain(
                                (ava->la_flags & LDAP_AVA_STRING) &&
                                ava->la_value.bv_len &&
                                ( ber_bvstrcasecmp( &ava->la_attr, &DC ) == 0
-                               || ber_bvstrcasecmp( &ava->la_attr, &DCOID ) == 0 ) )
+                               || ber_bvcmp( &ava->la_attr, &DCOID ) == 0 ) )
                        {
                                if( domain.bv_len == 0 ) {
                                        ndomain = LDAP_REALLOC( domain.bv_val,
@@ -202,9 +202,7 @@ int ldap_domain2hostlist(
     }
     sprintf(request, "_ldap._tcp.%s", domain);
 
-#ifdef LDAP_R_COMPILE
-    ldap_pvt_thread_mutex_lock(&ldap_int_resolv_mutex);
-#endif
+    LDAP_MUTEX_LOCK(&ldap_int_resolv_mutex);
 
     rc = LDAP_UNAVAILABLE;
 #ifdef NS_HFIXEDSZ
@@ -275,8 +273,12 @@ int ldap_domain2hostlist(
                /* weight = (p[2] << 8) | p[3]; */
                port = (p[4] << 8) | p[5];
 
-               buflen = strlen(host) + sizeof(":65355 ");
-               hostlist = (char *) LDAP_REALLOC(hostlist, cur + buflen);
+               if ( port == 0 || host[ 0 ] == '\0' ) {
+                   goto add_size;
+               }
+
+               buflen = strlen(host) + STRLENOF(":65355 ");
+               hostlist = (char *) LDAP_REALLOC(hostlist, cur + buflen + 1);
                if (hostlist == NULL) {
                    rc = LDAP_NO_MEMORY;
                    goto out;
@@ -285,8 +287,9 @@ int ldap_domain2hostlist(
                    /* not first time around */
                    hostlist[cur++] = ' ';
                }
-               cur += sprintf(&hostlist[cur], "%s:%hd", host, port);
+               cur += sprintf(&hostlist[cur], "%s:%hu", host, port);
            }
+add_size:;
            p += size;
        }
     }
@@ -300,9 +303,7 @@ int ldap_domain2hostlist(
        *list = hostlist;
 
   out:
-#ifdef LDAP_R_COMPILE
-    ldap_pvt_thread_mutex_unlock(&ldap_int_resolv_mutex);
-#endif
+    LDAP_MUTEX_UNLOCK(&ldap_int_resolv_mutex);
 
     if (request != NULL) {
        LDAP_FREE(request);