From d9b3eb2f8b2eb956e9092710cb5601939ec6b83b Mon Sep 17 00:00:00 2001
From: Petr Menšík <pemensik@redhat.com>
Date: Nov 13 2017 18:35:21 +0000
Subject: Fix dynamic symbols conflict with ldap (#1205168)


(cherry picked from commit 4d8c7099754496dfb0ed8143d51cb819346a07b2)

---

diff --git a/bind-9.11-rh1205168.patch b/bind-9.11-rh1205168.patch
new file mode 100644
index 0000000..181cec9
--- /dev/null
+++ b/bind-9.11-rh1205168.patch
@@ -0,0 +1,120 @@
+From 90416594843a56550e40b11561807786219ce1c4 Mon Sep 17 00:00:00 2001
+From: Evan Hunt <each@isc.org>
+Date: Mon, 11 Sep 2017 15:01:36 -0700
+Subject: [PATCH] remap getaddrinfo() to irs_getgetaddrinfo()
+
+The libirs version of getaddrinfo() cannot be called from within BIND9.
+
+fix prototypes
+---
+ lib/irs/include/irs/netdb.h.in | 94 ++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 94 insertions(+)
+
+diff --git a/lib/irs/include/irs/netdb.h.in b/lib/irs/include/irs/netdb.h.in
+index 23dcd37..f36113d 100644
+--- a/lib/irs/include/irs/netdb.h.in
++++ b/lib/irs/include/irs/netdb.h.in
+@@ -150,6 +150,100 @@ struct addrinfo {
+ #define	NI_DGRAM	0x00000010
+ 
+ /*
++ * Define to map into irs_ namespace.
++ */
++
++#define IRS_NAMESPACE
++
++#ifdef IRS_NAMESPACE
++
++/*
++ * Use our versions not the ones from the C library.
++ */
++
++#ifdef getnameinfo
++#undef getnameinfo
++#endif
++#define getnameinfo irs_getnameinfo
++
++#ifdef getaddrinfo
++#undef getaddrinfo
++#endif
++#define getaddrinfo irs_getaddrinfo
++
++#ifdef freeaddrinfo
++#undef freeaddrinfo
++#endif
++#define freeaddrinfo irs_freeaddrinfo
++
++#ifdef gai_strerror
++#undef gai_strerror
++#endif
++#define gai_strerror irs_gai_strerror
++
++#endif
++
++extern int getaddrinfo (const char *name,
++			const char *service,
++			const struct addrinfo *req,
++			struct addrinfo **pai);
++extern int getnameinfo (const struct sockaddr *sa,
++			socklen_t salen, char *host,
++			socklen_t hostlen, char *serv,
++			socklen_t servlen, int flags);
++extern void freeaddrinfo (struct addrinfo *ai);
++extern const char *gai_strerror (int ecode);
++
++/*
++ * Define to map into irs_ namespace.
++ */
++
++#define IRS_NAMESPACE
++
++#ifdef IRS_NAMESPACE
++
++/*
++ * Use our versions not the ones from the C library.
++ */
++
++#ifdef getnameinfo
++#undef getnameinfo
++#endif
++#define getnameinfo irs_getnameinfo
++
++#ifdef getaddrinfo
++#undef getaddrinfo
++#endif
++#define getaddrinfo irs_getaddrinfo
++
++#ifdef freeaddrinfo
++#undef freeaddrinfo
++#endif
++#define freeaddrinfo irs_freeaddrinfo
++
++#ifdef gai_strerror
++#undef gai_strerror
++#endif
++#define gai_strerror irs_gai_strerror
++
++int
++getaddrinfo(const char *hostname, const char *servname,
++	    const struct addrinfo *hints, struct addrinfo **res);
++
++int
++getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen,
++	    char *host, IRS_GETNAMEINFO_BUFLEN_T hostlen,
++	    char *serv, IRS_GETNAMEINFO_BUFLEN_T servlen,
++	    IRS_GETNAMEINFO_FLAGS_T flags);
++
++void freeaddrinfo (struct addrinfo *ai);
++
++IRS_GAISTRERROR_RETURN_T
++gai_strerror(int ecode);
++
++#endif
++
++/*
+  * Tell Emacs to use C mode on this file.
+  * Local variables:
+  * mode: c
+-- 
+2.9.5
+
diff --git a/bind.spec b/bind.spec
index 6365054..7344d31 100644
--- a/bind.spec
+++ b/bind.spec
@@ -81,6 +81,7 @@ Patch136:bind-9.10-dist-native-pkcs11.patch
 # introduced by https://source.isc.org/cgi-bin/gitweb.cgi?p=bind9.git;a=commit;h=fc9f0ac5778f78003a7acc957a23711811fec122
 Patch137:bind-9.10-use-of-strlcat.patch
 Patch139: bind-9.11-rh1236087.patch
+Patch145:bind-9.11-rh1205168.patch
 
 # SDB patches
 Patch11: bind-9.3.2b2-sdbsrc.patch
@@ -323,6 +324,7 @@ This package provides a module which allows commands to be sent to rndc directly
 %patch130 -p1 -b .libdb
 %patch131 -p1 -b .multlib-conflict
 %patch139 -p1 -b .rh1236087
+%patch145 -p1 -b .rh1205168
 
 %if %{PKCS11}
 cp -r bin/named{,-pkcs11}
@@ -1029,6 +1031,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %changelog
 * Mon Oct 23 2017 Petr Menšík <pemensik@redhat.com> - 32:9.10.5-3.P3
 - Include DNSKEY 20326 also in trusted-key.key (#1505476)
+- Fix dynamic symbols conflict with ldap (#1205168)
 
 * Mon Jul 10 2017 Petr Menšík <pemensik@redhat.com> - 32:9.10.5-2.P3
 - Update to 9.10.5-P3