2006-02-24 01:09:36 +00:00
|
|
|
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
|
2010-08-24 16:25:50 +00:00
|
|
|
the functions, even if we're not being compiled for use in libldap_r
|
|
|
|
|
|
|
|
|
|
Resolves: #179730
|
|
|
|
|
Author: Jeffery Layton <jlayton@redhat.com>
|
|
|
|
|
|
|
|
|
|
diff -uNPrp openldap-2.4.23.old/libraries/libldap/util-int.c openldap-2.4.23.new/libraries/libldap/util-int.c
|
|
|
|
|
--- openldap-2.4.23.old/libraries/libldap/util-int.c 2010-04-19 18:53:01.000000000 +0200
|
|
|
|
|
+++ openldap-2.4.23.new/libraries/libldap/util-int.c 2010-08-19 17:47:52.456805354 +0200
|
2008-09-01 08:09:50 +00:00
|
|
|
@@ -52,8 +52,8 @@ extern int h_errno;
|
2006-02-24 01:09:36 +00:00
|
|
|
#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 <ldap_pvt_thread.h>
|
2010-08-24 16:25:50 +00:00
|
|
|
@@ -330,7 +330,7 @@ ldap_pvt_csnstr(char *buf, size_t len, u
|
2006-02-24 01:09:36 +00:00
|
|
|
#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))
|
