X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-integ%2Frecipes-support%2Fopenldap%2Ffiles%2F0004-openlap-reentrant-gethostby.patch;fp=meta-starlingx%2Fmeta-stx-integ%2Frecipes-support%2Fopenldap%2Ffiles%2F0004-openlap-reentrant-gethostby.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=6f127b8be526e51a9c4f9ecbc14bec36d2b2f432;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0004-openlap-reentrant-gethostby.patch b/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0004-openlap-reentrant-gethostby.patch
deleted file mode 100644
index 6f127b8..0000000
--- a/meta-starlingx/meta-stx-integ/recipes-support/openldap/files/0004-openlap-reentrant-gethostby.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From df22708bcbe727570daada3fbf8065a447444716 Mon Sep 17 00:00:00 2001
-From: babak sarashki <babak.sarashki@windriver.com>
-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 <ldap_pvt_thread.h>
-@@ -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
-