diff options
Diffstat (limited to 'debian/patches/getaddrinfo-is-threadsafe')
| -rw-r--r-- | debian/patches/getaddrinfo-is-threadsafe | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/debian/patches/getaddrinfo-is-threadsafe b/debian/patches/getaddrinfo-is-threadsafe new file mode 100644 index 0000000..b79bcbf --- /dev/null +++ b/debian/patches/getaddrinfo-is-threadsafe @@ -0,0 +1,47 @@ +Author: Steve Langasek <vorlon@debian.org> + +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. + +Index: openldap/libraries/libldap/os-ip.c +=================================================================== +--- openldap.orig/libraries/libldap/os-ip.c 2022-05-20 17:36:12.989246703 -0400 ++++ openldap/libraries/libldap/os-ip.c 2022-05-20 17:36:12.989246703 -0400 +@@ -645,13 +645,7 @@ + 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 ) { + Debug1(LDAP_DEBUG_TRACE, + "ldap_connect_to_host: getaddrinfo failed: %s\n", +Index: openldap/libraries/libldap/util-int.c +=================================================================== +--- openldap.orig/libraries/libldap/util-int.c 2022-05-20 17:36:12.989246703 -0400 ++++ openldap/libraries/libldap/util-int.c 2022-05-20 17:36:12.989246703 -0400 +@@ -559,9 +559,7 @@ + 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; + |