summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2004-02-23 20:51:06 -0800
committerTim Rice <tim@multitalents.net>2004-02-23 20:51:06 -0800
commit18959006c0a6bf399a2ed5342cce827cf1cee2cf (patch)
treebb9ae4471d7304939de12984fc58ff084df71804
parent2359aa985d5d853fb06cf1499bc6e1b0fe0173d4 (diff)
[openbsd-compat/getrrsetbyname.c] Make gcc 2.7.2.3 happy. ok djm@
-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 cf719e83..552fedf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@
using sysconf() if available Based on patches from
holger AT van-lengerich.de and openssh_bugzilla AT hockin.org
- (dtucker) [uidswap.c] Minor KNF. ok djm@
+ - (tim) [openbsd-compat/getrrsetbyname.c] Make gcc 2.7.2.3 happy. ok djm@
20040223
- (dtucker) [session.c] Bug #789: Only make setcred call for !privsep in the
@@ -1923,4 +1924,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3251 2004/02/24 02:17:30 dtucker Exp $
+$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 bb5451cd..66d18142 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -51,8 +51,6 @@
#include "getrrsetbyname.h"
-/* #include "thread_private.h" */
-
#define ANSWER_BUFFER_SIZE 1024*64
struct dns_query {
@@ -161,7 +159,6 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
unsigned int rdtype, unsigned int flags,
struct rrsetinfo **res)
{
- struct __res_state *_resp = &_res;
int result;
struct rrsetinfo *rrset = NULL;
struct dns_response *response;
@@ -190,19 +187,19 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
}
/* initialize resolver */
- if ((_resp->options & RES_INIT) == 0 && res_init() == -1) {
+ if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
result = ERRSET_FAIL;
goto fail;
}
#ifdef DEBUG
- _resp->options |= RES_DEBUG;
+ _res.options |= RES_DEBUG;
#endif /* DEBUG */
#ifdef RES_USE_DNSSEC
/* turn on DNSSEC if EDNS0 is configured */
- if (_resp->options & RES_USE_EDNS0)
- _resp->options |= RES_USE_DNSSEC;
+ if (_res.options & RES_USE_EDNS0)
+ _res.options |= RES_USE_DNSSEC;
#endif /* RES_USE_DNSEC */
/* make query */