diff options
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/servconf.c b/servconf.c index 0f16c851e..6297143f1 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.88 2001/07/11 00:24:53 itojun Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.89 2001/08/16 19:18:34 jakob Exp $"); |
14 | 14 | ||
15 | #if defined(KRB4) || defined(KRB5) | 15 | #if defined(KRB4) || defined(KRB5) |
16 | #include <krb.h> | 16 | #include <krb.h> |
@@ -56,7 +56,6 @@ initialize_server_options(ServerOptions *options) | |||
56 | options->ignore_user_known_hosts = -1; | 56 | options->ignore_user_known_hosts = -1; |
57 | options->print_motd = -1; | 57 | options->print_motd = -1; |
58 | options->print_lastlog = -1; | 58 | options->print_lastlog = -1; |
59 | options->check_mail = -1; | ||
60 | options->x11_forwarding = -1; | 59 | options->x11_forwarding = -1; |
61 | options->x11_display_offset = -1; | 60 | options->x11_display_offset = -1; |
62 | options->xauth_location = NULL; | 61 | options->xauth_location = NULL; |
@@ -138,8 +137,6 @@ fill_default_server_options(ServerOptions *options) | |||
138 | options->ignore_rhosts = 1; | 137 | options->ignore_rhosts = 1; |
139 | if (options->ignore_user_known_hosts == -1) | 138 | if (options->ignore_user_known_hosts == -1) |
140 | options->ignore_user_known_hosts = 0; | 139 | options->ignore_user_known_hosts = 0; |
141 | if (options->check_mail == -1) | ||
142 | options->check_mail = 0; | ||
143 | if (options->print_motd == -1) | 140 | if (options->print_motd == -1) |
144 | options->print_motd = 1; | 141 | options->print_motd = 1; |
145 | if (options->print_lastlog == -1) | 142 | if (options->print_lastlog == -1) |
@@ -241,7 +238,7 @@ typedef enum { | |||
241 | sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress, | 238 | sPasswordAuthentication, sKbdInteractiveAuthentication, sListenAddress, |
242 | sPrintMotd, sPrintLastLog, sIgnoreRhosts, | 239 | sPrintMotd, sPrintLastLog, sIgnoreRhosts, |
243 | sX11Forwarding, sX11DisplayOffset, | 240 | sX11Forwarding, sX11DisplayOffset, |
244 | sStrictModes, sEmptyPasswd, sKeepAlives, sCheckMail, | 241 | sStrictModes, sEmptyPasswd, sKeepAlives, |
245 | sUseLogin, sAllowTcpForwarding, | 242 | sUseLogin, sAllowTcpForwarding, |
246 | sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups, | 243 | sAllowUsers, sDenyUsers, sAllowGroups, sDenyGroups, |
247 | sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile, | 244 | sIgnoreUserKnownHosts, sCiphers, sMacs, sProtocol, sPidFile, |
@@ -249,7 +246,7 @@ typedef enum { | |||
249 | sBanner, sReverseMappingCheck, sHostbasedAuthentication, | 246 | sBanner, sReverseMappingCheck, sHostbasedAuthentication, |
250 | sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, | 247 | sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, |
251 | sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, | 248 | sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, |
252 | sPAMAuthenticationViaKbdInt | 249 | sDeprecated, sPAMAuthenticationViaKbdInt |
253 | } ServerOpCodes; | 250 | } ServerOpCodes; |
254 | 251 | ||
255 | /* Textual representation of the tokens. */ | 252 | /* Textual representation of the tokens. */ |
@@ -289,7 +286,7 @@ static struct { | |||
289 | { "kbdinteractiveauthentication", sKbdInteractiveAuthentication }, | 286 | { "kbdinteractiveauthentication", sKbdInteractiveAuthentication }, |
290 | { "challengeresponseauthentication", sChallengeResponseAuthentication }, | 287 | { "challengeresponseauthentication", sChallengeResponseAuthentication }, |
291 | { "skeyauthentication", sChallengeResponseAuthentication }, /* alias */ | 288 | { "skeyauthentication", sChallengeResponseAuthentication }, /* alias */ |
292 | { "checkmail", sCheckMail }, | 289 | { "checkmail", sDeprecated }, |
293 | { "listenaddress", sListenAddress }, | 290 | { "listenaddress", sListenAddress }, |
294 | { "printmotd", sPrintMotd }, | 291 | { "printmotd", sPrintMotd }, |
295 | { "printlastlog", sPrintLastLog }, | 292 | { "printlastlog", sPrintLastLog }, |
@@ -625,10 +622,6 @@ parse_flag: | |||
625 | intptr = &options->kbd_interactive_authentication; | 622 | intptr = &options->kbd_interactive_authentication; |
626 | goto parse_flag; | 623 | goto parse_flag; |
627 | 624 | ||
628 | case sCheckMail: | ||
629 | intptr = &options->check_mail; | ||
630 | goto parse_flag; | ||
631 | |||
632 | case sChallengeResponseAuthentication: | 625 | case sChallengeResponseAuthentication: |
633 | intptr = &options->challenge_response_authentication; | 626 | intptr = &options->challenge_response_authentication; |
634 | goto parse_flag; | 627 | goto parse_flag; |
@@ -842,6 +835,13 @@ parse_flag: | |||
842 | intptr = &options->client_alive_count_max; | 835 | intptr = &options->client_alive_count_max; |
843 | goto parse_int; | 836 | goto parse_int; |
844 | 837 | ||
838 | case sDeprecated: | ||
839 | log("%s line %d: Deprecated option %s", | ||
840 | filename, linenum, arg); | ||
841 | while(arg) | ||
842 | arg = strdelim(&cp); | ||
843 | break; | ||
844 | |||
845 | case sPAMAuthenticationViaKbdInt: | 845 | case sPAMAuthenticationViaKbdInt: |
846 | intptr = &options->pam_authentication_via_kbd_int; | 846 | intptr = &options->pam_authentication_via_kbd_int; |
847 | goto parse_flag; | 847 | goto parse_flag; |