summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-05-15 13:27:28 +1000
committerDamien Miller <djm@mindrot.org>2003-05-15 13:27:28 +1000
commitb0622653baa8e4136e116945fdd1c393ab0eaba3 (patch)
tree8b4ebb7caee7a4d22eb43250ff19d987318f840d
parent5975cf12c309735fe3fd6a81782d46a11d166437 (diff)
- jakob@cvs.openbsd.org 2003/05/15 02:27:15
[dns.c] add missing freerrset
-rw-r--r--ChangeLog5
-rw-r--r--dns.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 32de30915..5243876e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@
19 - jakob@cvs.openbsd.org 2003/05/15 01:48:10 19 - jakob@cvs.openbsd.org 2003/05/15 01:48:10
20 [readconf.c readconf.h servconf.c servconf.h] 20 [readconf.c readconf.h servconf.c servconf.h]
21 always parse kerberos options. ok djm@ markus@ 21 always parse kerberos options. ok djm@ markus@
22 - jakob@cvs.openbsd.org 2003/05/15 02:27:15
23 [dns.c]
24 add missing freerrset
22 - (djm) Always parse UsePAM 25 - (djm) Always parse UsePAM
23 - (djm) Configure glue for DNS support (code doesn't work in portable yet) 26 - (djm) Configure glue for DNS support (code doesn't work in portable yet)
24 - (djm) Import getrrsetbyname() function from OpenBSD libc (for DNS support) 27 - (djm) Import getrrsetbyname() function from OpenBSD libc (for DNS support)
@@ -1499,4 +1502,4 @@
1499 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1502 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1500 ok provos@ 1503 ok provos@
1501 1504
1502$Id: ChangeLog,v 1.2709 2003/05/15 03:23:36 djm Exp $ 1505$Id: ChangeLog,v 1.2710 2003/05/15 03:27:28 djm Exp $
diff --git a/dns.c b/dns.c
index 9b7a0e7a0..14ca13a48 100644
--- a/dns.c
+++ b/dns.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dns.c,v 1.4 2003/05/14 23:29:22 jakob Exp $ */ 1/* $OpenBSD: dns.c,v 1.5 2003/05/15 02:27:15 jakob Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2003 Wesley Griffin. All rights reserved. 4 * Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -44,7 +44,7 @@
44#include "uuencode.h" 44#include "uuencode.h"
45 45
46extern char *__progname; 46extern char *__progname;
47RCSID("$OpenBSD: dns.c,v 1.4 2003/05/14 23:29:22 jakob Exp $"); 47RCSID("$OpenBSD: dns.c,v 1.5 2003/05/15 02:27:15 jakob Exp $");
48 48
49#ifndef LWRES 49#ifndef LWRES
50static const char *errset_text[] = { 50static const char *errset_text[] = {
@@ -183,6 +183,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
183 /* Only accept validated answers */ 183 /* Only accept validated answers */
184 if (!fingerprints->rri_flags & RRSET_VALIDATED) { 184 if (!fingerprints->rri_flags & RRSET_VALIDATED) {
185 error("Ignored unvalidated fingerprint from DNS."); 185 error("Ignored unvalidated fingerprint from DNS.");
186 freerrset(fingerprints);
186 return DNS_VERIFY_ERROR; 187 return DNS_VERIFY_ERROR;
187 } 188 }
188#endif 189#endif
@@ -193,6 +194,7 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
193 if (!dns_read_key(&hostkey_algorithm, &hostkey_digest_type, 194 if (!dns_read_key(&hostkey_algorithm, &hostkey_digest_type,
194 &hostkey_digest, &hostkey_digest_len, hostkey)) { 195 &hostkey_digest, &hostkey_digest_len, hostkey)) {
195 error("Error calculating host key fingerprint."); 196 error("Error calculating host key fingerprint.");
197 freerrset(fingerprints);
196 return DNS_VERIFY_ERROR; 198 return DNS_VERIFY_ERROR;
197 } 199 }
198 200