diff options
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/servconf.c b/servconf.c index c4b2bb284..e9c313bbb 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -10,7 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "includes.h" | 12 | #include "includes.h" |
13 | RCSID("$OpenBSD: servconf.c,v 1.123 2003/07/22 13:35:22 markus Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.124 2003/08/13 08:46:30 markus Exp $"); |
14 | 14 | ||
15 | #include "ssh.h" | 15 | #include "ssh.h" |
16 | #include "log.h" | 16 | #include "log.h" |
@@ -64,7 +64,6 @@ initialize_server_options(ServerOptions *options) | |||
64 | options->keepalives = -1; | 64 | options->keepalives = -1; |
65 | options->log_facility = SYSLOG_FACILITY_NOT_SET; | 65 | options->log_facility = SYSLOG_FACILITY_NOT_SET; |
66 | options->log_level = SYSLOG_LEVEL_NOT_SET; | 66 | options->log_level = SYSLOG_LEVEL_NOT_SET; |
67 | options->rhosts_authentication = -1; | ||
68 | options->rhosts_rsa_authentication = -1; | 67 | options->rhosts_rsa_authentication = -1; |
69 | options->hostbased_authentication = -1; | 68 | options->hostbased_authentication = -1; |
70 | options->hostbased_uses_name_from_packet_only = -1; | 69 | options->hostbased_uses_name_from_packet_only = -1; |
@@ -165,8 +164,6 @@ fill_default_server_options(ServerOptions *options) | |||
165 | options->log_facility = SYSLOG_FACILITY_AUTH; | 164 | options->log_facility = SYSLOG_FACILITY_AUTH; |
166 | if (options->log_level == SYSLOG_LEVEL_NOT_SET) | 165 | if (options->log_level == SYSLOG_LEVEL_NOT_SET) |
167 | options->log_level = SYSLOG_LEVEL_INFO; | 166 | options->log_level = SYSLOG_LEVEL_INFO; |
168 | if (options->rhosts_authentication == -1) | ||
169 | options->rhosts_authentication = 0; | ||
170 | if (options->rhosts_rsa_authentication == -1) | 167 | if (options->rhosts_rsa_authentication == -1) |
171 | options->rhosts_rsa_authentication = 0; | 168 | options->rhosts_rsa_authentication = 0; |
172 | if (options->hostbased_authentication == -1) | 169 | if (options->hostbased_authentication == -1) |
@@ -248,7 +245,7 @@ typedef enum { | |||
248 | /* Standard Options */ | 245 | /* Standard Options */ |
249 | sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime, | 246 | sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime, |
250 | sPermitRootLogin, sLogFacility, sLogLevel, | 247 | sPermitRootLogin, sLogFacility, sLogLevel, |
251 | sRhostsAuthentication, sRhostsRSAAuthentication, sRSAAuthentication, | 248 | sRhostsRSAAuthentication, sRSAAuthentication, |
252 | sKerberosAuthentication, sKerberosOrLocalPasswd, sKerberosTicketCleanup, | 249 | sKerberosAuthentication, sKerberosOrLocalPasswd, sKerberosTicketCleanup, |
253 | sKerberosTgtPassing, sChallengeResponseAuthentication, | 250 | sKerberosTgtPassing, sChallengeResponseAuthentication, |
254 | sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress, | 251 | sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress, |
@@ -288,7 +285,7 @@ static struct { | |||
288 | { "permitrootlogin", sPermitRootLogin }, | 285 | { "permitrootlogin", sPermitRootLogin }, |
289 | { "syslogfacility", sLogFacility }, | 286 | { "syslogfacility", sLogFacility }, |
290 | { "loglevel", sLogLevel }, | 287 | { "loglevel", sLogLevel }, |
291 | { "rhostsauthentication", sRhostsAuthentication }, | 288 | { "rhostsauthentication", sDeprecated }, |
292 | { "rhostsrsaauthentication", sRhostsRSAAuthentication }, | 289 | { "rhostsrsaauthentication", sRhostsRSAAuthentication }, |
293 | { "hostbasedauthentication", sHostbasedAuthentication }, | 290 | { "hostbasedauthentication", sHostbasedAuthentication }, |
294 | { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly }, | 291 | { "hostbasedusesnamefrompacketonly", sHostbasedUsesNameFromPacketOnly }, |
@@ -589,10 +586,6 @@ parse_flag: | |||
589 | intptr = &options->ignore_user_known_hosts; | 586 | intptr = &options->ignore_user_known_hosts; |
590 | goto parse_flag; | 587 | goto parse_flag; |
591 | 588 | ||
592 | case sRhostsAuthentication: | ||
593 | intptr = &options->rhosts_authentication; | ||
594 | goto parse_flag; | ||
595 | |||
596 | case sRhostsRSAAuthentication: | 589 | case sRhostsRSAAuthentication: |
597 | intptr = &options->rhosts_rsa_authentication; | 590 | intptr = &options->rhosts_rsa_authentication; |
598 | goto parse_flag; | 591 | goto parse_flag; |