- markus@cvs.openbsd.org 2001/10/01 21:51:16

     [readconf.c readconf.h ssh.1 sshconnect.c]
     add NoHostAuthenticationForLocalhost; note that the hostkey is
     now check for localhost, too.

1 files changed, 3 insertions, 2 deletions

diff --git a/sshconnect.c b/sshconnect.c
index 0ae100fed..6a9b5489e 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.110 2001/07/25 14:35:18 markus Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.111 2001/10/01 21:51:16 markus Exp $");
 
 #include <openssl/bn.h>
 
@@ -587,7 +587,8 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
                 salen = sizeof(struct sockaddr_storage);
                 break;
         }
-        if (local && options.host_key_alias == NULL) {
+        if (options.no_host_authentication_for_localhost == 1 && local &&
+            options.host_key_alias == NULL) {
                 debug("Forcing accepting of host key for "
                     "loopback/localhost.");
                 return 0;