summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-11-12 14:06:29 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-11-12 14:06:29 +1100
commit16fd99c72702049030901b15a158a2159fe8f428 (patch)
tree8050c690e23be592f97b1af20fcb089a4408a951
parentf032435de7849ae80aa53df8028902711889a414 (diff)
- (dtucker) [openbsd-compat/getrrsetbyname.c] Restore Portable-specific
ifdef lost during sync. Spotted by tim@.
-rw-r--r--ChangeLog6
-rw-r--r--openbsd-compat/getrrsetbyname.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 291bf970a..e87996bb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120051112
2 - (dtucker) [openbsd-compat/getrrsetbyname.c] Restore Portable-specific
3 ifdef lost during sync. Spotted by tim@.
4
120051110 520051110
2 - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from 6 - (dtucker) [openbsd-compat/setenv.c] Merge changes for __findenv from
3 OpenBSD getenv.c revs 1.4 - 1.8 (ANSIfication of arguments, removal of 7 OpenBSD getenv.c revs 1.4 - 1.8 (ANSIfication of arguments, removal of
@@ -3292,4 +3296,4 @@
3292 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3296 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3293 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3297 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3294 3298
3295$Id: ChangeLog,v 1.3989 2005/11/10 10:30:36 dtucker Exp $ 3299$Id: ChangeLog,v 1.3990 2005/11/12 03:06:29 dtucker Exp $
diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c
index 8d571beea..bea6aea3b 100644
--- a/openbsd-compat/getrrsetbyname.c
+++ b/openbsd-compat/getrrsetbyname.c
@@ -262,9 +262,11 @@ getrrsetbyname(const char *hostname, unsigned int rdclass,
262 rrset->rri_ttl = response->answer->ttl; 262 rrset->rri_ttl = response->answer->ttl;
263 rrset->rri_nrdatas = response->header.ancount; 263 rrset->rri_nrdatas = response->header.ancount;
264 264
265#ifdef HAVE_HEADER_AD
265 /* check for authenticated data */ 266 /* check for authenticated data */
266 if (response->header.ad == 1) 267 if (response->header.ad == 1)
267 rrset->rri_flags |= RRSET_VALIDATED; 268 rrset->rri_flags |= RRSET_VALIDATED;
269#endif
268 270
269 /* copy name from answer section */ 271 /* copy name from answer section */
270 rrset->rri_name = strdup(response->answer->name); 272 rrset->rri_name = strdup(response->answer->name);