- jakob@cvs.openbsd.org 2003/06/11 10:18:47

[dns.c]
     sync with check_host_key() change

ChangeLog

@@ -15,6 +15,9 @@
    - jakob@cvs.openbsd.org 2003/06/11 10:16:16
      [sshconnect.c]
      clean up check_host_key() and improve SSHFP feedback. ok markus@
+   - jakob@cvs.openbsd.org 2003/06/11 10:18:47
+     [dns.c]
+     sync with check_host_key() change
 
 
 20030609
@@ -499,4 +502,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.2795 2003/06/11 12:05:25 djm Exp $
+$Id: ChangeLog,v 1.2796 2003/06/11 12:05:45 djm Exp $

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");