[configure.ac acconfig.h openbsd-compat/getrrsetbyname.c] test for

HEADER.ad in arpa/nameser.h
This commit is contained in:
Tim Rice 2003-09-08 14:35:16 -07:00
parent 0ac16a4492
commit b284e16c10
4 changed files with 13 additions and 3 deletions

View File

@ -1,6 +1,8 @@
20030908 20030908
- (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and
_getlong in #ifndef _getlong in #ifndef
- (tim) [configure.ac acconfig.h openbsd-compat/getrrsetbyname.c] test for
HEADER.ad in arpa/nameser.h
20030907 20030907
- (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)] - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)]
@ -1041,4 +1043,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.2970 2003/09/08 13:33:33 tim Exp $ $Id: ChangeLog,v 1.2971 2003/09/08 21:35:16 tim Exp $

View File

@ -1,4 +1,4 @@
/* $Id: acconfig.h,v 1.164 2003/09/07 01:37:27 dtucker Exp $ */ /* $Id: acconfig.h,v 1.165 2003/09/08 21:35:17 tim Exp $ */
/* /*
* Copyright (c) 1999-2003 Damien Miller. All rights reserved. * Copyright (c) 1999-2003 Damien Miller. All rights reserved.
@ -418,6 +418,9 @@
/* Define if getrrsetbyname() exists */ /* Define if getrrsetbyname() exists */
#undef HAVE_GETRRSETBYNAME #undef HAVE_GETRRSETBYNAME
/* Define if HEADER.ad exists in arpa/nameser.h */
#undef HAVE_HEADER_AD
@BOTTOM@ @BOTTOM@
/* ******************* Shouldn't need to edit below this line ************** */ /* ******************* Shouldn't need to edit below this line ************** */

View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.146 2003/09/08 13:33:33 tim Exp $ # $Id: configure.ac,v 1.147 2003/09/08 21:35:17 tim Exp $
AC_INIT AC_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -1913,6 +1913,9 @@ AC_ARG_WITH(dns,
AC_SEARCH_LIBS(res_query, resolv) AC_SEARCH_LIBS(res_query, resolv)
AC_SEARCH_LIBS(dn_expand, resolv) AC_SEARCH_LIBS(dn_expand, resolv)
AC_CHECK_FUNCS(_getshort _getlong) AC_CHECK_FUNCS(_getshort _getlong)
AC_CHECK_MEMBER(HEADER.ad,
[AC_DEFINE(HAVE_HEADER_AD)],,
[#include <arpa/nameser.h>])
]) ])
fi fi
] ]

View File

@ -243,9 +243,11 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
rrset->rri_ttl = response->answer->ttl; rrset->rri_ttl = response->answer->ttl;
rrset->rri_nrdatas = response->header.ancount; rrset->rri_nrdatas = response->header.ancount;
#ifdef HAVE_HEADER_AD
/* check for authenticated data */ /* check for authenticated data */
if (response->header.ad == 1) if (response->header.ad == 1)
rrset->rri_flags |= RRSET_VALIDATED; rrset->rri_flags |= RRSET_VALIDATED;
#endif
/* copy name from answer section */ /* copy name from answer section */
length = strlen(response->answer->name); length = strlen(response->answer->name);