getaddrinfo-is-threadsafe

OpenLDAP upstream conservatively assumes that certain resolver functions
(getaddrinfo, getnameinfo, res_query, dn_expand) are not re-entrant; but we
know that the glibc implementations of these functions are thread-safe, so
we should bypass the use of this mutex.  This fixes a locking problem when
an application uses libldap and libnss-ldap is also used for hosts
resolution.

Closes Debian bug #340601.

Not suitable for forwarding upstream; might be made suitable by adding a
configure-time check for glibc and disabling the mutex only on known
thread-safe implementations.

Gbp-Pq: Name getaddrinfo-is-threadsafe

diff --git a/libraries/libldap/os-ip.c b/libraries/libldap/os-ip.c
index 9ad9d5743c87a39e66d78ef0d1e5e3de7eea423d..334705f03d12aaa12208637bc0c7ef00710b506f 100644 (file)
--- a/libraries/libldap/os-ip.c
+++ b/libraries/libldap/os-ip.c
@@ -602,13 +602,7 @@ ldap_connect_to_host(LDAP *ld, Sockbuf *sb,
        hints.ai_socktype = socktype;
        snprintf(serv, sizeof serv, "%d", port );
 
-       /* most getaddrinfo(3) use non-threadsafe resolver libraries */
-       LDAP_MUTEX_LOCK(&ldap_int_resolv_mutex);
-
        err = getaddrinfo( host, serv, &hints, &res );
-
-       LDAP_MUTEX_UNLOCK(&ldap_int_resolv_mutex);
-
        if ( err != 0 ) {
                osip_debug(ld, "ldap_connect_to_host: getaddrinfo failed: %s\n",
                        AC_GAI_STRERROR(err), 0, 0);

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index 2695ee2b02293f3987f09c32c9006894ba780db9..22ab3c9af940bc8d1318067109746ba55b9da6f2 100644 (file)
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -534,9 +534,7 @@ int ldap_pvt_get_hname(
        int rc;
 #if defined( HAVE_GETNAMEINFO )
 
-       LDAP_MUTEX_LOCK( &ldap_int_resolv_mutex );
        rc = getnameinfo( sa, len, name, namelen, NULL, 0, 0 );
-       LDAP_MUTEX_UNLOCK( &ldap_int_resolv_mutex );
        if ( rc ) *err = (char *)AC_GAI_STRERROR( rc );
        return rc;