diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | openbsd-compat/getrrsetbyname.c | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -80,6 +80,9 @@ | |||
80 | - deraadt@cvs.openbsd.org 2005/11/28 17:50:12 | 80 | - deraadt@cvs.openbsd.org 2005/11/28 17:50:12 |
81 | [openbsd-compat/glob.c] | 81 | [openbsd-compat/glob.c] |
82 | unused arg in internal static API | 82 | unused arg in internal static API |
83 | - jakob@cvs.openbsd.org 2007/10/11 18:36:41 | ||
84 | [openbsd-compat/getrrsetbyname.c] | ||
85 | use RRSIG instead of SIG for DNSSEC. ok djm@ | ||
83 | - (djm) [regress/sftp-cmds.sh] | 86 | - (djm) [regress/sftp-cmds.sh] |
84 | Use more restrictive glob to pick up test files from /bin - some platforms | 87 | Use more restrictive glob to pick up test files from /bin - some platforms |
85 | ship broken symlinks there which could spoil the test. | 88 | ship broken symlinks there which could spoil the test. |
@@ -3354,4 +3357,4 @@ | |||
3354 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3357 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3355 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3358 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3356 | 3359 | ||
3357 | $Id: ChangeLog,v 1.4779 2007/10/26 06:13:39 djm Exp $ | 3360 | $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 @@ | |||
1 | /* $OpenBSD: getrrsetbyname.c,v 1.10 2005/03/30 02:58:28 tedu Exp $ */ | 1 | /* $OpenBSD: getrrsetbyname.c,v 1.11 2007/10/11 18:36:41 jakob Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001 Jakob Schlyter. All rights reserved. | 4 | * Copyright (c) 2001 Jakob Schlyter. All rights reserved. |
@@ -288,7 +288,7 @@ getrrsetbyname(const char *hostname, unsigned int rdclass, | |||
288 | rrset->rri_nrdatas = count_dns_rr(response->answer, rrset->rri_rdclass, | 288 | rrset->rri_nrdatas = count_dns_rr(response->answer, rrset->rri_rdclass, |
289 | rrset->rri_rdtype); | 289 | rrset->rri_rdtype); |
290 | rrset->rri_nsigs = count_dns_rr(response->answer, rrset->rri_rdclass, | 290 | rrset->rri_nsigs = count_dns_rr(response->answer, rrset->rri_rdclass, |
291 | T_SIG); | 291 | T_RRSIG); |
292 | 292 | ||
293 | /* allocate memory for answers */ | 293 | /* allocate memory for answers */ |
294 | rrset->rri_rdatas = calloc(rrset->rri_nrdatas, | 294 | rrset->rri_rdatas = calloc(rrset->rri_nrdatas, |
@@ -318,7 +318,7 @@ getrrsetbyname(const char *hostname, unsigned int rdclass, | |||
318 | rdata = &rrset->rri_rdatas[index_ans++]; | 318 | rdata = &rrset->rri_rdatas[index_ans++]; |
319 | 319 | ||
320 | if (rr->class == rrset->rri_rdclass && | 320 | if (rr->class == rrset->rri_rdclass && |
321 | rr->type == T_SIG) | 321 | rr->type == T_RRSIG) |
322 | rdata = &rrset->rri_sigs[index_sig++]; | 322 | rdata = &rrset->rri_sigs[index_sig++]; |
323 | 323 | ||
324 | if (rdata) { | 324 | if (rdata) { |