From df22708bcbe727570daada3fbf8065a447444716 Mon Sep 17 00:00:00 2001 From: babak sarashki Date: Sun, 3 Nov 2019 14:34:19 -0800 Subject: [PATCH 04/20] openlap reentrant gethostby The non-reentrant gethostbyXXXX() functions deadlock if called recursively, for example if libldap needs to be initialized from within gethostbyXXXX() (which actually happens if nss_ldap is used for hostname resolution and earlier modules can't resolve the local host name), so use the reentrant versions of the functions, even if we're not being compiled for use in libldap_r From STX openldap-reentrant-gethostby.patch --- libraries/libldap/util-int.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c index e65db0c..0628951 100644 --- a/libraries/libldap/util-int.c +++ b/libraries/libldap/util-int.c @@ -52,8 +52,8 @@ extern int h_errno; #ifndef LDAP_R_COMPILE # undef HAVE_REENTRANT_FUNCTIONS # undef HAVE_CTIME_R -# undef HAVE_GETHOSTBYNAME_R -# undef HAVE_GETHOSTBYADDR_R +/* # undef HAVE_GETHOSTBYNAME_R */ +/* # undef HAVE_GETHOSTBYADDR_R */ #else # include @@ -420,7 +420,7 @@ ldap_pvt_csnstr(char *buf, size_t len, unsigned int replica, unsigned int mod) #define BUFSTART (1024-32) #define BUFMAX (32*1024-32) -#if defined(LDAP_R_COMPILE) +#if defined(LDAP_R_COMPILE) || defined(HAVE_GETHOSTBYNAME_R) && defined(HAVE_GETHOSTBYADDR_R) static char *safe_realloc( char **buf, int len ); #if !(defined(HAVE_GETHOSTBYNAME_R) && defined(HAVE_GETHOSTBYADDR_R)) -- 2.17.1