diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 36 |
1 files changed, 13 insertions, 23 deletions
diff --git a/readconf.c b/readconf.c index 7920ac86d..c32a225ea 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.95 2002/02/04 12:15:25 markus Exp $"); | 15 | RCSID("$OpenBSD: readconf.c,v 1.96 2002/06/08 05:17:01 markus Exp $"); |
16 | 16 | ||
17 | #include "ssh.h" | 17 | #include "ssh.h" |
18 | #include "xmalloc.h" | 18 | #include "xmalloc.h" |
@@ -41,7 +41,7 @@ RCSID("$OpenBSD: readconf.c,v 1.95 2002/02/04 12:15:25 markus Exp $"); | |||
41 | # that they are given in. | 41 | # that they are given in. |
42 | 42 | ||
43 | Host *.ngs.fi ngs.fi | 43 | Host *.ngs.fi ngs.fi |
44 | FallBackToRsh no | 44 | User foo |
45 | 45 | ||
46 | Host fake.com | 46 | Host fake.com |
47 | HostName another.host.name.real.org | 47 | HostName another.host.name.real.org |
@@ -65,7 +65,7 @@ RCSID("$OpenBSD: readconf.c,v 1.95 2002/02/04 12:15:25 markus Exp $"); | |||
65 | ProxyCommand ssh-proxy %h %p | 65 | ProxyCommand ssh-proxy %h %p |
66 | 66 | ||
67 | Host *.fr | 67 | Host *.fr |
68 | UseRsh yes | 68 | PublicKeyAuthentication no |
69 | 69 | ||
70 | Host *.su | 70 | Host *.su |
71 | Cipher none | 71 | Cipher none |
@@ -79,8 +79,6 @@ RCSID("$OpenBSD: readconf.c,v 1.95 2002/02/04 12:15:25 markus Exp $"); | |||
79 | PasswordAuthentication yes | 79 | PasswordAuthentication yes |
80 | RSAAuthentication yes | 80 | RSAAuthentication yes |
81 | RhostsRSAAuthentication yes | 81 | RhostsRSAAuthentication yes |
82 | FallBackToRsh no | ||
83 | UseRsh no | ||
84 | StrictHostKeyChecking yes | 82 | StrictHostKeyChecking yes |
85 | KeepAlives no | 83 | KeepAlives no |
86 | IdentityFile ~/.ssh/identity | 84 | IdentityFile ~/.ssh/identity |
@@ -94,7 +92,7 @@ RCSID("$OpenBSD: readconf.c,v 1.95 2002/02/04 12:15:25 markus Exp $"); | |||
94 | typedef enum { | 92 | typedef enum { |
95 | oBadOption, | 93 | oBadOption, |
96 | oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication, | 94 | oForwardAgent, oForwardX11, oGatewayPorts, oRhostsAuthentication, |
97 | oPasswordAuthentication, oRSAAuthentication, oFallBackToRsh, oUseRsh, | 95 | oPasswordAuthentication, oRSAAuthentication, |
98 | oChallengeResponseAuthentication, oXAuthLocation, | 96 | oChallengeResponseAuthentication, oXAuthLocation, |
99 | #if defined(KRB4) || defined(KRB5) | 97 | #if defined(KRB4) || defined(KRB5) |
100 | oKerberosAuthentication, | 98 | oKerberosAuthentication, |
@@ -115,7 +113,8 @@ typedef enum { | |||
115 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, | 113 | oKbdInteractiveAuthentication, oKbdInteractiveDevices, oHostKeyAlias, |
116 | oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, | 114 | oDynamicForward, oPreferredAuthentications, oHostbasedAuthentication, |
117 | oHostKeyAlgorithms, oBindAddress, oSmartcardDevice, | 115 | oHostKeyAlgorithms, oBindAddress, oSmartcardDevice, |
118 | oClearAllForwardings, oNoHostAuthenticationForLocalhost | 116 | oClearAllForwardings, oNoHostAuthenticationForLocalhost, |
117 | oDeprecated | ||
119 | } OpCodes; | 118 | } OpCodes; |
120 | 119 | ||
121 | /* Textual representations of the tokens. */ | 120 | /* Textual representations of the tokens. */ |
@@ -150,8 +149,8 @@ static struct { | |||
150 | #ifdef AFS | 149 | #ifdef AFS |
151 | { "afstokenpassing", oAFSTokenPassing }, | 150 | { "afstokenpassing", oAFSTokenPassing }, |
152 | #endif | 151 | #endif |
153 | { "fallbacktorsh", oFallBackToRsh }, | 152 | { "fallbacktorsh", oDeprecated }, |
154 | { "usersh", oUseRsh }, | 153 | { "usersh", oDeprecated }, |
155 | { "identityfile", oIdentityFile }, | 154 | { "identityfile", oIdentityFile }, |
156 | { "identityfile2", oIdentityFile }, /* alias */ | 155 | { "identityfile2", oIdentityFile }, /* alias */ |
157 | { "hostname", oHostName }, | 156 | { "hostname", oHostName }, |
@@ -373,14 +372,6 @@ parse_flag: | |||
373 | intptr = &options->afs_token_passing; | 372 | intptr = &options->afs_token_passing; |
374 | goto parse_flag; | 373 | goto parse_flag; |
375 | #endif | 374 | #endif |
376 | case oFallBackToRsh: | ||
377 | intptr = &options->fallback_to_rsh; | ||
378 | goto parse_flag; | ||
379 | |||
380 | case oUseRsh: | ||
381 | intptr = &options->use_rsh; | ||
382 | goto parse_flag; | ||
383 | |||
384 | case oBatchMode: | 375 | case oBatchMode: |
385 | intptr = &options->batch_mode; | 376 | intptr = &options->batch_mode; |
386 | goto parse_flag; | 377 | goto parse_flag; |
@@ -678,6 +669,11 @@ parse_int: | |||
678 | *intptr = value; | 669 | *intptr = value; |
679 | break; | 670 | break; |
680 | 671 | ||
672 | case oDeprecated: | ||
673 | fatal("%s line %d: Deprecated option \"%s\"", | ||
674 | filename, linenum, keyword); | ||
675 | break; | ||
676 | |||
681 | default: | 677 | default: |
682 | fatal("process_config_line: Unimplemented opcode %d", opcode); | 678 | fatal("process_config_line: Unimplemented opcode %d", opcode); |
683 | } | 679 | } |
@@ -765,8 +761,6 @@ initialize_options(Options * options) | |||
765 | options->kbd_interactive_devices = NULL; | 761 | options->kbd_interactive_devices = NULL; |
766 | options->rhosts_rsa_authentication = -1; | 762 | options->rhosts_rsa_authentication = -1; |
767 | options->hostbased_authentication = -1; | 763 | options->hostbased_authentication = -1; |
768 | options->fallback_to_rsh = -1; | ||
769 | options->use_rsh = -1; | ||
770 | options->batch_mode = -1; | 764 | options->batch_mode = -1; |
771 | options->check_host_ip = -1; | 765 | options->check_host_ip = -1; |
772 | options->strict_host_key_checking = -1; | 766 | options->strict_host_key_checking = -1; |
@@ -849,10 +843,6 @@ fill_default_options(Options * options) | |||
849 | options->rhosts_rsa_authentication = 1; | 843 | options->rhosts_rsa_authentication = 1; |
850 | if (options->hostbased_authentication == -1) | 844 | if (options->hostbased_authentication == -1) |
851 | options->hostbased_authentication = 0; | 845 | options->hostbased_authentication = 0; |
852 | if (options->fallback_to_rsh == -1) | ||
853 | options->fallback_to_rsh = 0; | ||
854 | if (options->use_rsh == -1) | ||
855 | options->use_rsh = 0; | ||
856 | if (options->batch_mode == -1) | 846 | if (options->batch_mode == -1) |
857 | options->batch_mode = 0; | 847 | options->batch_mode = 0; |
858 | if (options->check_host_ip == -1) | 848 | if (options->check_host_ip == -1) |