4 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 9ab15b58c..0343f2134 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20030908
  - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and
    _getlong in #ifndef
+ - (tim) [configure.ac acconfig.h openbsd-compat/getrrsetbyname.c] test for
+   HEADER.ad in arpa/nameser.h
 
 20030907
  - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)]
@@ -1041,4 +1043,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.2970 2003/09/08 13:33:33 tim Exp $
+$Id: ChangeLog,v 1.2971 2003/09/08 21:35:16 tim Exp $
diff --git a/acconfig.h b/acconfig.h
index f6f5f27e0..ea8fcb0b4 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -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.
@@ -418,6 +418,9 @@
 /* Define if getrrsetbyname() exists */
 #undef HAVE_GETRRSETBYNAME
 
+/* Define if HEADER.ad exists in arpa/nameser.h */
+#undef HAVE_HEADER_AD
+
 @BOTTOM@
 
 /* ******************* Shouldn't need to edit below this line ************** */
diff --git a/configure.ac b/configure.ac
index 58777a4ec..08bfdabcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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_CONFIG_SRCDIR([ssh.c])
@@ -1913,6 +1913,9 @@ AC_ARG_WITH(dns,
                                         AC_SEARCH_LIBS(res_query, resolv)
                                         AC_SEARCH_LIBS(dn_expand, resolv)
                                         AC_CHECK_FUNCS(_getshort _getlong)
+                                        AC_CHECK_MEMBER(HEADER.ad,
+                                                [AC_DEFINE(HAVE_HEADER_AD)],,
+                                                [#include <arpa/nameser.h>])
                                 ])
                 fi
         ]
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 3f75590e2..44fa2755b 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -243,9 +243,11 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
         rrset->rri_ttl = response->answer->ttl;
         rrset->rri_nrdatas = response->header.ancount;
 
+#ifdef HAVE_HEADER_AD
         /* check for authenticated data */
         if (response->header.ad == 1)
                 rrset->rri_flags |= RRSET_VALIDATED;
+#endif
 
         /* copy name from answer section */
         length = strlen(response->answer->name);