a2a915
From 90416594843a56550e40b11561807786219ce1c4 Mon Sep 17 00:00:00 2001
a2a915
From: Evan Hunt <each@isc.org>
a2a915
Date: Mon, 11 Sep 2017 15:01:36 -0700
a2a915
Subject: [PATCH] remap getaddrinfo() to irs_getgetaddrinfo()
a2a915
a2a915
The libirs version of getaddrinfo() cannot be called from within BIND9.
a2a915
a2a915
fix prototypes
a2a915
---
a2a915
 lib/irs/include/irs/netdb.h.in | 94 ++++++++++++++++++++++++++++++++++++++++++
a2a915
 1 file changed, 94 insertions(+)
a2a915
a2a915
diff --git a/lib/irs/include/irs/netdb.h.in b/lib/irs/include/irs/netdb.h.in
a2a915
index 23dcd37..f36113d 100644
a2a915
--- a/lib/irs/include/irs/netdb.h.in
a2a915
+++ b/lib/irs/include/irs/netdb.h.in
a2a915
@@ -150,6 +150,100 @@ struct addrinfo {
a2a915
 #define	NI_DGRAM	0x00000010
a2a915
 
a2a915
 /*
a2a915
+ * Define to map into irs_ namespace.
a2a915
+ */
a2a915
+
a2a915
+#define IRS_NAMESPACE
a2a915
+
a2a915
+#ifdef IRS_NAMESPACE
a2a915
+
a2a915
+/*
a2a915
+ * Use our versions not the ones from the C library.
a2a915
+ */
a2a915
+
a2a915
+#ifdef getnameinfo
a2a915
+#undef getnameinfo
a2a915
+#endif
a2a915
+#define getnameinfo irs_getnameinfo
a2a915
+
a2a915
+#ifdef getaddrinfo
a2a915
+#undef getaddrinfo
a2a915
+#endif
a2a915
+#define getaddrinfo irs_getaddrinfo
a2a915
+
a2a915
+#ifdef freeaddrinfo
a2a915
+#undef freeaddrinfo
a2a915
+#endif
a2a915
+#define freeaddrinfo irs_freeaddrinfo
a2a915
+
a2a915
+#ifdef gai_strerror
a2a915
+#undef gai_strerror
a2a915
+#endif
a2a915
+#define gai_strerror irs_gai_strerror
a2a915
+
a2a915
+#endif
a2a915
+
a2a915
+extern int getaddrinfo (const char *name,
a2a915
+			const char *service,
a2a915
+			const struct addrinfo *req,
a2a915
+			struct addrinfo **pai);
a2a915
+extern int getnameinfo (const struct sockaddr *sa,
a2a915
+			socklen_t salen, char *host,
a2a915
+			socklen_t hostlen, char *serv,
a2a915
+			socklen_t servlen, int flags);
a2a915
+extern void freeaddrinfo (struct addrinfo *ai);
a2a915
+extern const char *gai_strerror (int ecode);
a2a915
+
a2a915
+/*
a2a915
+ * Define to map into irs_ namespace.
a2a915
+ */
a2a915
+
a2a915
+#define IRS_NAMESPACE
a2a915
+
a2a915
+#ifdef IRS_NAMESPACE
a2a915
+
a2a915
+/*
a2a915
+ * Use our versions not the ones from the C library.
a2a915
+ */
a2a915
+
a2a915
+#ifdef getnameinfo
a2a915
+#undef getnameinfo
a2a915
+#endif
a2a915
+#define getnameinfo irs_getnameinfo
a2a915
+
a2a915
+#ifdef getaddrinfo
a2a915
+#undef getaddrinfo
a2a915
+#endif
a2a915
+#define getaddrinfo irs_getaddrinfo
a2a915
+
a2a915
+#ifdef freeaddrinfo
a2a915
+#undef freeaddrinfo
a2a915
+#endif
a2a915
+#define freeaddrinfo irs_freeaddrinfo
a2a915
+
a2a915
+#ifdef gai_strerror
a2a915
+#undef gai_strerror
a2a915
+#endif
a2a915
+#define gai_strerror irs_gai_strerror
a2a915
+
a2a915
+int
a2a915
+getaddrinfo(const char *hostname, const char *servname,
a2a915
+	    const struct addrinfo *hints, struct addrinfo **res);
a2a915
+
a2a915
+int
a2a915
+getnameinfo(const struct sockaddr *sa, IRS_GETNAMEINFO_SOCKLEN_T salen,
a2a915
+	    char *host, IRS_GETNAMEINFO_BUFLEN_T hostlen,
a2a915
+	    char *serv, IRS_GETNAMEINFO_BUFLEN_T servlen,
a2a915
+	    IRS_GETNAMEINFO_FLAGS_T flags);
a2a915
+
a2a915
+void freeaddrinfo (struct addrinfo *ai);
a2a915
+
a2a915
+IRS_GAISTRERROR_RETURN_T
a2a915
+gai_strerror(int ecode);
a2a915
+
a2a915
+#endif
a2a915
+
a2a915
+/*
a2a915
  * Tell Emacs to use C mode on this file.
a2a915
  * Local variables:
a2a915
  * mode: c
a2a915
-- 
a2a915
2.9.5
a2a915