RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Tim Rice 2004-02-23 20:51:06 -08:00
parent 2359aa985d
commit 18959006c0
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20,6 +20,7 @@
using sysconf() if available Based on patches from using sysconf() if available Based on patches from
holger AT van-lengerich.de and openssh_bugzilla AT hockin.org holger AT van-lengerich.de and openssh_bugzilla AT hockin.org
- (dtucker) [uidswap.c] Minor KNF. ok djm@ - (dtucker) [uidswap.c] Minor KNF. ok djm@
- (tim) [openbsd-compat/getrrsetbyname.c] Make gcc 2.7.2.3 happy. ok djm@
20040223 20040223
- (dtucker) [session.c] Bug #789: Only make setcred call for !privsep in the - (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. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

11
openbsd-compat/getrrsetbyname.c
View File

@ -51,8 +51,6 @@
#include "getrrsetbyname.h" #include "getrrsetbyname.h"
/* #include "thread_private.h" */
#define ANSWER_BUFFER_SIZE 1024*64 #define ANSWER_BUFFER_SIZE 1024*64
struct dns_query { struct dns_query {
@ -161,7 +159,6 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
unsigned int rdtype, unsigned int flags, unsigned int rdtype, unsigned int flags,
struct rrsetinfo **res) struct rrsetinfo **res)
{ {
struct __res_state *_resp = &_res;
int result; int result;
struct rrsetinfo *rrset = NULL; struct rrsetinfo *rrset = NULL;
struct dns_response *response; struct dns_response *response;
@ -190,19 +187,19 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
} }
/* initialize resolver */ /* initialize resolver */
if ((_resp->options & RES_INIT) == 0 && res_init() == -1) { if ((_res.options & RES_INIT) == 0 && res_init() == -1) {
result = ERRSET_FAIL; result = ERRSET_FAIL;
goto fail; goto fail;
} }
#ifdef DEBUG #ifdef DEBUG
_resp->options |= RES_DEBUG; _res.options |= RES_DEBUG;
#endif /* DEBUG */ #endif /* DEBUG */
#ifdef RES_USE_DNSSEC #ifdef RES_USE_DNSSEC
/* turn on DNSSEC if EDNS0 is configured */ /* turn on DNSSEC if EDNS0 is configured */
if (_resp->options & RES_USE_EDNS0) if (_res.options & RES_USE_EDNS0)
_resp->options |= RES_USE_DNSSEC; _res.options |= RES_USE_DNSSEC;
#endif /* RES_USE_DNSEC */ #endif /* RES_USE_DNSEC */
/* make query */ /* make query */