summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--openbsd-compat/getrrsetbyname.c11
2 files changed, 6 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index cf719e831..552fedf73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@
20 using sysconf() if available Based on patches from 20 using sysconf() if available Based on patches from
21 holger AT van-lengerich.de and openssh_bugzilla AT hockin.org 21 holger AT van-lengerich.de and openssh_bugzilla AT hockin.org
22 - (dtucker) [uidswap.c] Minor KNF. ok djm@ 22 - (dtucker) [uidswap.c] Minor KNF. ok djm@
23 - (tim) [openbsd-compat/getrrsetbyname.c] Make gcc 2.7.2.3 happy. ok djm@
23 24
2420040223 2520040223
25 - (dtucker) [session.c] Bug #789: Only make setcred call for !privsep in the 26 - (dtucker) [session.c] Bug #789: Only make setcred call for !privsep in the
@@ -1923,4 +1924,4 @@
1923 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1924 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1924 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1925 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1925 1926
1926$Id: ChangeLog,v 1.3251 2004/02/24 02:17:30 dtucker Exp $ 1927$Id: ChangeLog,v 1.3252 2004/02/24 04:51:06 tim Exp $
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index bb5451cd2..66d18142e 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -51,8 +51,6 @@
51 51
52#include "getrrsetbyname.h" 52#include "getrrsetbyname.h"
53 53
54/* #include "thread_private.h" */
55
56#define ANSWER_BUFFER_SIZE 1024*64 54#define ANSWER_BUFFER_SIZE 1024*64
57 55
58struct dns_query { 56struct dns_query {
@@ -161,7 +159,6 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
161 unsigned int rdtype, unsigned int flags, 159 unsigned int rdtype, unsigned int flags,
162 struct rrsetinfo **res) 160 struct rrsetinfo **res)
163{ 161{
164 struct __res_state *_resp = &_res;
165 int result; 162 int result;
166 struct rrsetinfo *rrset = NULL; 163 struct rrsetinfo *rrset = NULL;
167 struct dns_response *response; 164 struct dns_response *response;
@@ -190,19 +187,19 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
190 } 187 }
191 188
192 /* initialize resolver */ 189 /* initialize resolver */
193 if ((_resp->options & RES_INIT) == 0 && res_init() == -1) { 190 if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
194 result = ERRSET_FAIL; 191 result = ERRSET_FAIL;
195 goto fail; 192 goto fail;
196 } 193 }
197 194
198#ifdef DEBUG 195#ifdef DEBUG
199 _resp->options |= RES_DEBUG; 196 _res.options |= RES_DEBUG;
200#endif /* DEBUG */ 197#endif /* DEBUG */
201 198
202#ifdef RES_USE_DNSSEC 199#ifdef RES_USE_DNSSEC
203 /* turn on DNSSEC if EDNS0 is configured */ 200 /* turn on DNSSEC if EDNS0 is configured */
204 if (_resp->options & RES_USE_EDNS0) 201 if (_res.options & RES_USE_EDNS0)
205 _resp->options |= RES_USE_DNSSEC; 202 _res.options |= RES_USE_DNSSEC;
206#endif /* RES_USE_DNSEC */ 203#endif /* RES_USE_DNSEC */
207 204
208 /* make query */ 205 /* make query */