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

     [dns.c]
     sync with check_host_key() change

diff --git a/ChangeLog b/ChangeLog
index 08ffa7a32682d6496c2d79ef689af899f84f863f..e5716fcff04cb60c4e6613a9b9bf8737cf81b28b 100644 (file)
--- a/ChangeLog
+++ b/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

diff --git a/dns.c b/dns.c
index 14ca13a48446c5da7d70e9f443f799994c0d0ccb..90ab5601a5429acf0fadb841780825414b990cd0 100644 (file)
--- a/dns.c
+++ b/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");