summaryrefslogtreecommitdiff
path: root/dns.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-06-11 22:05:45 +1000
committerDamien Miller <djm@mindrot.org>2003-06-11 22:05:45 +1000
commit0e1b937f1362866765c09c11d3f4066f108ff910 (patch)
treecc1055e3cc9995ae74f66bedc7f08eff32e69a04 /dns.c
parent7392ae62706e67828714f66d53676bc64f68b1e8 (diff)
- jakob@cvs.openbsd.org 2003/06/11 10:18:47
[dns.c] sync with check_host_key() change
Diffstat (limited to 'dns.c')
-rw-r--r--dns.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/dns.c b/dns.c
index 14ca13a48..90ab5601a 100644
--- a/dns.c
+++ b/dns.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dns.c,v 1.5 2003/05/15 02:27:15 jakob Exp $ */ 1/* $OpenBSD: dns.c,v 1.6 2003/06/11 10:18:47 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.5 2003/05/15 02:27:15 jakob Exp $"); 47RCSID("$OpenBSD: dns.c,v 1.6 2003/06/11 10:18:47 jakob Exp $");
48 48
49#ifndef LWRES 49#ifndef LWRES
50static const char *errset_text[] = { 50static const char *errset_text[] = {
@@ -221,13 +221,8 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
221 221
222 /* Matching algoritm and digest. */ 222 /* Matching algoritm and digest. */
223 freerrset(fingerprints); 223 freerrset(fingerprints);
224#ifdef DNSSEC
225 debug("matching host key fingerprint found in DNS"); 224 debug("matching host key fingerprint found in DNS");
226 return DNS_VERIFY_OK; 225 return DNS_VERIFY_OK;
227#else
228 logit("Matching host key fingerprint found in DNS.");
229 return DNS_VERIFY_ERROR;
230#endif
231 } else { 226 } else {
232 /* Correct algorithm but bad digest */ 227 /* Correct algorithm but bad digest */
233 debug("verify_hostkey_dns: failed"); 228 debug("verify_hostkey_dns: failed");