From: Mark Andrews <marka@isc.org>
Date: Fri, 14 Sep 2007 05:32:25 +0000 (+0000)
Subject: 2237.   [bug]           libbind: res_init() was not thread aware. [RT #17123]
X-Git-Tag: v9.3.5b1~34^2~26
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a7b7a4ebc38ec7460e95da6d3d70ffe7b59573b8;p=thirdparty%2Fbind9.git

2237.   [bug]           libbind: res_init() was not thread aware. [RT #17123]
---

diff --git a/CHANGES b/CHANGES
index 928d0572576..fe08744cd2f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2237.	[bug]		libbind: res_init() was not thread aware. [RT #17123]
+
 2236.	[bug]		dnssec-signzone failed to preserve the case of
 			of wildcard owner names. [RT #17085]
 
diff --git a/lib/bind/resolv/res_data.c b/lib/bind/resolv/res_data.c
index ff6727c260a..be5a12529d7 100644
--- a/lib/bind/resolv/res_data.c
+++ b/lib/bind/resolv/res_data.c
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: res_data.c,v 1.4 2005/04/27 04:56:41 sra Exp $";
+static const char rcsid[] = "$Id: res_data.c,v 1.5 2007/09/14 05:32:25 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include "port_before.h"
@@ -40,7 +40,6 @@ static const char rcsid[] = "$Id: res_data.c,v 1.4 2005/04/27 04:56:41 sra Exp $
 #include <unistd.h>
 
 #include "port_after.h"
-#undef _res
 
 const char *_res_opcodes[] = {
 	"QUERY",
@@ -70,6 +69,7 @@ const char *_res_sectioncodes[] = {
 };
 #endif
 
+#undef _res
 #ifndef __BIND_NOSTATIC
 struct __res_state _res
 # if defined(__BIND_RES_TEXT)
@@ -77,6 +77,10 @@ struct __res_state _res
 # endif
         ;
 
+#if defined(DO_PTHREADS) || defined(__linux)
+#define _res (*__res_state())
+#endif
+
 /* Proto. */
 
 int  res_ourserver_p(const res_state, const struct sockaddr_in *);