1 files changed, 10 insertions, 2 deletions

diff --git a/readconf.c b/readconf.c
index 83069d3ad..63035b37f 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.90 2001/09/19 19:24:18 stevesk Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.91 2001/10/01 21:51:16 markus Exp $");
 
 #include "ssh.h"
 #include "xmalloc.h"
@@ -115,7 +115,7 @@ typedef enum {
         oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias,
         oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication,
         oHostKeyAlgorithms, oBindAddress, oSmartcardDevice,
-        oClearAllForwardings
+        oClearAllForwardings, oNoHostAuthenticationForLocalhost 
 } OpCodes;
 
 /* Textual representations of the tokens. */
@@ -186,6 +186,7 @@ static struct {
         { "bindaddress", oBindAddress },
         { "smartcarddevice", oSmartcardDevice },
         { "clearallforwardings", oClearAllForwardings }, 
+        { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost }, 
         { NULL, 0 }
 };
 
@@ -415,6 +416,10 @@ parse_flag:
                 intptr = &options->keepalives;
                 goto parse_flag;
 
+        case oNoHostAuthenticationForLocalhost:
+                intptr = &options->no_host_authentication_for_localhost;
+                goto parse_flag;
+
         case oNumberOfPasswordPrompts:
                 intptr = &options->number_of_password_prompts;
                 goto parse_int;
@@ -793,6 +798,7 @@ initialize_options(Options * options)
         options->preferred_authentications = NULL;
         options->bind_address = NULL;
         options->smartcard_device = NULL;
+        options->no_host_authentication_for_localhost = - 1;
 }
 
 /*
@@ -911,6 +917,8 @@ fill_default_options(Options * options)
                 options->log_level = SYSLOG_LEVEL_INFO;
         if (options->clear_forwardings == 1)
                 clear_forwardings(options);
+        if (options->no_host_authentication_for_localhost == - 1)
+                options->no_host_authentication_for_localhost = 0;
         /* options->proxy_command should not be set by default */
         /* options->user will be set in the main program if appropriate */
         /* options->hostname will be set in the main program if appropriate */