diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | acconfig.h | 5 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | openbsd-compat/getrrsetbyname.c | 2 |
4 files changed, 13 insertions, 3 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20030908 | 1 | 20030908 |
2 | - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and | 2 | - (tim) [configure.ac openbsd-compat/getrrsetbyname.c] wrap _getshort and |
3 | _getlong in #ifndef | 3 | _getlong in #ifndef |
4 | - (tim) [configure.ac acconfig.h openbsd-compat/getrrsetbyname.c] test for | ||
5 | HEADER.ad in arpa/nameser.h | ||
4 | 6 | ||
5 | 20030907 | 7 | 20030907 |
6 | - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)] | 8 | - (dtucker) [agent-ptrace.sh dynamic-forward.sh (all regress/)] |
@@ -1041,4 +1043,4 @@ | |||
1041 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1043 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1042 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1044 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1043 | 1045 | ||
1044 | $Id: ChangeLog,v 1.2970 2003/09/08 13:33:33 tim Exp $ | 1046 | $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 @@ | |||
1 | /* $Id: acconfig.h,v 1.164 2003/09/07 01:37:27 dtucker Exp $ */ | 1 | /* $Id: acconfig.h,v 1.165 2003/09/08 21:35:17 tim Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -418,6 +418,9 @@ | |||
418 | /* Define if getrrsetbyname() exists */ | 418 | /* Define if getrrsetbyname() exists */ |
419 | #undef HAVE_GETRRSETBYNAME | 419 | #undef HAVE_GETRRSETBYNAME |
420 | 420 | ||
421 | /* Define if HEADER.ad exists in arpa/nameser.h */ | ||
422 | #undef HAVE_HEADER_AD | ||
423 | |||
421 | @BOTTOM@ | 424 | @BOTTOM@ |
422 | 425 | ||
423 | /* ******************* Shouldn't need to edit below this line ************** */ | 426 | /* ******************* 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 @@ | |||
1 | # $Id: configure.ac,v 1.146 2003/09/08 13:33:33 tim Exp $ | 1 | # $Id: configure.ac,v 1.147 2003/09/08 21:35:17 tim Exp $ |
2 | 2 | ||
3 | AC_INIT | 3 | AC_INIT |
4 | AC_CONFIG_SRCDIR([ssh.c]) | 4 | AC_CONFIG_SRCDIR([ssh.c]) |
@@ -1913,6 +1913,9 @@ AC_ARG_WITH(dns, | |||
1913 | AC_SEARCH_LIBS(res_query, resolv) | 1913 | AC_SEARCH_LIBS(res_query, resolv) |
1914 | AC_SEARCH_LIBS(dn_expand, resolv) | 1914 | AC_SEARCH_LIBS(dn_expand, resolv) |
1915 | AC_CHECK_FUNCS(_getshort _getlong) | 1915 | AC_CHECK_FUNCS(_getshort _getlong) |
1916 | AC_CHECK_MEMBER(HEADER.ad, | ||
1917 | [AC_DEFINE(HAVE_HEADER_AD)],, | ||
1918 | [#include <arpa/nameser.h>]) | ||
1916 | ]) | 1919 | ]) |
1917 | fi | 1920 | fi |
1918 | ] | 1921 | ] |
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, | |||
243 | rrset->rri_ttl = response->answer->ttl; | 243 | rrset->rri_ttl = response->answer->ttl; |
244 | rrset->rri_nrdatas = response->header.ancount; | 244 | rrset->rri_nrdatas = response->header.ancount; |
245 | 245 | ||
246 | #ifdef HAVE_HEADER_AD | ||
246 | /* check for authenticated data */ | 247 | /* check for authenticated data */ |
247 | if (response->header.ad == 1) | 248 | if (response->header.ad == 1) |
248 | rrset->rri_flags |= RRSET_VALIDATED; | 249 | rrset->rri_flags |= RRSET_VALIDATED; |
250 | #endif | ||
249 | 251 | ||
250 | /* copy name from answer section */ | 252 | /* copy name from answer section */ |
251 | length = strlen(response->answer->name); | 253 | length = strlen(response->answer->name); |