=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/readconf.c,v retrieving revision 1.76.2.1 retrieving revision 1.76.2.2 diff -u -r1.76.2.1 -r1.76.2.2 --- src/usr.bin/ssh/readconf.c 2001/09/27 19:03:54 1.76.2.1 +++ src/usr.bin/ssh/readconf.c 2001/11/15 00:15:19 1.76.2.2 @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: readconf.c,v 1.76.2.1 2001/09/27 19:03:54 jason Exp $"); +RCSID("$OpenBSD: readconf.c,v 1.76.2.2 2001/11/15 00:15:19 miod Exp $"); #include "ssh.h" #include "xmalloc.h" @@ -115,7 +115,7 @@ oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, oHostKeyAlgorithms, oBindAddress, oSmartcardDevice, - oClearAllForwardings + oClearAllForwardings, oNoHostAuthenticationForLocalhost } OpCodes; /* Textual representations of the tokens. */ @@ -186,6 +186,7 @@ { "bindaddress", oBindAddress }, { "smartcarddevice", oSmartcardDevice }, { "clearallforwardings", oClearAllForwardings }, + { "nohostauthenticationforlocalhost", oNoHostAuthenticationForLocalhost }, { NULL, 0 } }; @@ -413,6 +414,10 @@ 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; @@ -791,6 +796,7 @@ options->preferred_authentications = NULL; options->bind_address = NULL; options->smartcard_device = NULL; + options->no_host_authentication_for_localhost = - 1; } /* @@ -909,6 +915,8 @@ 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 */