[openbsd-compat/getrrsetbyname.c] Make gcc 2.7.2.3 happy. ok djm@

diff --git a/ChangeLog b/ChangeLog
index 4a04cff9f7a1012fb0947b844742fdf5319f35f6..6db53782edf655907626f4f46ac9ea1082266658 100644 (file)
--- 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

diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index bb5451cd26fd0ccce3c46d94de09b3ad01f46c08..66d18142e0de63aa423d2b5731adfad606f07879 100644 (file)
--- 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 */