From 9ed564349195376767bb2ef8cbb502401f0d0dbf Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 26 Oct 2007 16:14:46 +1000 Subject: - jakob@cvs.openbsd.org 2007/10/11 18:36:41 [openbsd-compat/getrrsetbyname.c] use RRSIG instead of SIG for DNSSEC. ok djm@ --- ChangeLog | 5 ++++- openbsd-compat/getrrsetbyname.c | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0b6f9630..36798706b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,9 @@ - deraadt@cvs.openbsd.org 2005/11/28 17:50:12 [openbsd-compat/glob.c] unused arg in internal static API + - jakob@cvs.openbsd.org 2007/10/11 18:36:41 + [openbsd-compat/getrrsetbyname.c] + use RRSIG instead of SIG for DNSSEC. ok djm@ - (djm) [regress/sftp-cmds.sh] Use more restrictive glob to pick up test files from /bin - some platforms ship broken symlinks there which could spoil the test. @@ -3354,4 +3357,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4779 2007/10/26 06:13:39 djm Exp $ +$Id: ChangeLog,v 1.4780 2007/10/26 06:14:46 djm Exp $ diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c index 80af3f542..785b22569 100644 --- a/openbsd-compat/getrrsetbyname.c +++ b/openbsd-compat/getrrsetbyname.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getrrsetbyname.c,v 1.10 2005/03/30 02:58:28 tedu Exp $ */ +/* $OpenBSD: getrrsetbyname.c,v 1.11 2007/10/11 18:36:41 jakob Exp $ */ /* * Copyright (c) 2001 Jakob Schlyter. All rights reserved. @@ -288,7 +288,7 @@ getrrsetbyname(const char *hostname, unsigned int rdclass, rrset->rri_nrdatas = count_dns_rr(response->answer, rrset->rri_rdclass, rrset->rri_rdtype); rrset->rri_nsigs = count_dns_rr(response->answer, rrset->rri_rdclass, - T_SIG); + T_RRSIG); /* allocate memory for answers */ rrset->rri_rdatas = calloc(rrset->rri_nrdatas, @@ -318,7 +318,7 @@ getrrsetbyname(const char *hostname, unsigned int rdclass, rdata = &rrset->rri_rdatas[index_ans++]; if (rr->class == rrset->rri_rdclass && - rr->type == T_SIG) + rr->type == T_RRSIG) rdata = &rrset->rri_sigs[index_sig++]; if (rdata) { -- cgit v1.2.3