X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fdnssrv.c;h=16b15447cac2bfefc717104998aa5b065cb6fb87;hb=7164c4c66215da39f03e353a9c72eba408abddbf;hp=09e3936cc38544f816a4649ed8946f3aef68c97e;hpb=b03afa868c547f323c121c33b53f94da35391af5;p=openldap

diff --git a/libraries/libldap/dnssrv.c b/libraries/libldap/dnssrv.c
index 09e3936cc3..16b15447ca 100644
--- 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-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -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
@@ -289,7 +287,7 @@ 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;
@@ -305,9 +303,7 @@ add_size:;
 	*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);