summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJakob Schlyter <jakob@cvs.openbsd.org>2003-06-11 10:18:48 +0000
committerJakob Schlyter <jakob@cvs.openbsd.org>2003-06-11 10:18:48 +0000
commit7db9d8c29cbc74e16b380837971521f808812343 (patch)
tree039924d11cac0a6bfae793ebe0a7e2ec52005e29 /usr.bin
parent2629f5a93abafae5df2eb25df9c0ea652fb2a25b (diff)
sync with check_host_key() change
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/dns.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.bin/ssh/dns.c b/usr.bin/ssh/dns.c
index 14ca13a4844..90ab5601a54 100644
--- a/usr.bin/ssh/dns.c
+++ b/usr.bin/ssh/dns.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dns.c,v 1.5 2003/05/15 02:27:15 jakob Exp $ */
+/* $OpenBSD: dns.c,v 1.6 2003/06/11 10:18:47 jakob Exp $ */
/*
* Copyright (c) 2003 Wesley Griffin. All rights reserved.
@@ -44,7 +44,7 @@
#include "uuencode.h"
extern char *__progname;
-RCSID("$OpenBSD: dns.c,v 1.5 2003/05/15 02:27:15 jakob Exp $");
+RCSID("$OpenBSD: dns.c,v 1.6 2003/06/11 10:18:47 jakob Exp $");
#ifndef LWRES
static const char *errset_text[] = {
@@ -221,13 +221,8 @@ verify_host_key_dns(const char *hostname, struct sockaddr *address,
/* Matching algoritm and digest. */
freerrset(fingerprints);
-#ifdef DNSSEC
debug("matching host key fingerprint found in DNS");
return DNS_VERIFY_OK;
-#else
- logit("Matching host key fingerprint found in DNS.");
- return DNS_VERIFY_ERROR;
-#endif
} else {
/* Correct algorithm but bad digest */
debug("verify_hostkey_dns: failed");