diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c index 2b2981476..33d40e8c3 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: readconf.c,v 1.66 2001/03/10 12:53:52 deraadt Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.67 2001/03/10 17:51:04 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -109,7 +109,8 @@ typedef enum { | |||
109 | oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts, | 109 | oCompressionLevel, oKeepAlives, oNumberOfPasswordPrompts, |
110 | oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oMacs, | 110 | oUsePrivilegedPort, oLogLevel, oCiphers, oProtocol, oMacs, |
111 | oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, | 111 | oGlobalKnownHostsFile2, oUserKnownHostsFile2, oPubkeyAuthentication, |
112 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias | 112 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, |
113 | oPreferredAuthentications | ||
113 | } OpCodes; | 114 | } OpCodes; |
114 | 115 | ||
115 | /* Textual representations of the tokens. */ | 116 | /* Textual representations of the tokens. */ |
@@ -171,6 +172,7 @@ static struct { | |||
171 | { "keepalive", oKeepAlives }, | 172 | { "keepalive", oKeepAlives }, |
172 | { "numberofpasswordprompts", oNumberOfPasswordPrompts }, | 173 | { "numberofpasswordprompts", oNumberOfPasswordPrompts }, |
173 | { "loglevel", oLogLevel }, | 174 | { "loglevel", oLogLevel }, |
175 | { "preferredauthentications", oPreferredAuthentications }, | ||
174 | { NULL, 0 } | 176 | { NULL, 0 } |
175 | }; | 177 | }; |
176 | 178 | ||
@@ -446,6 +448,10 @@ parse_string: | |||
446 | charptr = &options->host_key_alias; | 448 | charptr = &options->host_key_alias; |
447 | goto parse_string; | 449 | goto parse_string; |
448 | 450 | ||
451 | case oPreferredAuthentications: | ||
452 | charptr = &options->preferred_authentications; | ||
453 | goto parse_string; | ||
454 | |||
449 | case oProxyCommand: | 455 | case oProxyCommand: |
450 | charptr = &options->proxy_command; | 456 | charptr = &options->proxy_command; |
451 | string = xstrdup(""); | 457 | string = xstrdup(""); |
@@ -722,6 +728,7 @@ initialize_options(Options * options) | |||
722 | options->num_local_forwards = 0; | 728 | options->num_local_forwards = 0; |
723 | options->num_remote_forwards = 0; | 729 | options->num_remote_forwards = 0; |
724 | options->log_level = (LogLevel) - 1; | 730 | options->log_level = (LogLevel) - 1; |
731 | options->preferred_authentications = NULL; | ||
725 | } | 732 | } |
726 | 733 | ||
727 | /* | 734 | /* |
@@ -837,4 +844,5 @@ fill_default_options(Options * options) | |||
837 | /* options->user will be set in the main program if appropriate */ | 844 | /* options->user will be set in the main program if appropriate */ |
838 | /* options->hostname will be set in the main program if appropriate */ | 845 | /* options->hostname will be set in the main program if appropriate */ |
839 | /* options->host_key_alias should not be set by default */ | 846 | /* options->host_key_alias should not be set by default */ |
847 | /* options->preferred_authentications will be set in ssh */ | ||
840 | } | 848 | } |