diff options
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/servconf.c b/servconf.c index 5840961e3..f37193a8f 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.120 2003/05/15 04:08:44 jakob Exp $"); | 13 | RCSID("$OpenBSD: servconf.c,v 1.121 2003/05/15 14:02:47 jakob Exp $"); |
14 | 14 | ||
15 | #if defined(KRB4) | 15 | #if defined(KRB4) |
16 | #include <krb.h> | 16 | #include <krb.h> |
@@ -207,11 +207,7 @@ fill_default_server_options(ServerOptions *options) | |||
207 | if (options->kerberos_or_local_passwd == -1) | 207 | if (options->kerberos_or_local_passwd == -1) |
208 | options->kerberos_or_local_passwd = 1; | 208 | options->kerberos_or_local_passwd = 1; |
209 | if (options->kerberos_ticket_cleanup == -1) | 209 | if (options->kerberos_ticket_cleanup == -1) |
210 | #if defined(KRB4) || defined(KRB5) | ||
211 | options->kerberos_ticket_cleanup = 1; | 210 | options->kerberos_ticket_cleanup = 1; |
212 | #else | ||
213 | options->kerberos_ticket_cleanup = 0; | ||
214 | #endif | ||
215 | if (options->kerberos_tgt_passing == -1) | 211 | if (options->kerberos_tgt_passing == -1) |
216 | options->kerberos_tgt_passing = 0; | 212 | options->kerberos_tgt_passing = 0; |
217 | if (options->afs_token_passing == -1) | 213 | if (options->afs_token_passing == -1) |
@@ -294,7 +290,7 @@ typedef enum { | |||
294 | sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, | 290 | sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, |
295 | sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, | 291 | sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, |
296 | sUsePrivilegeSeparation, | 292 | sUsePrivilegeSeparation, |
297 | sDeprecated | 293 | sDeprecated, sUnsupported |
298 | } ServerOpCodes; | 294 | } ServerOpCodes; |
299 | 295 | ||
300 | /* Textual representation of the tokens. */ | 296 | /* Textual representation of the tokens. */ |
@@ -322,11 +318,22 @@ static struct { | |||
322 | { "rsaauthentication", sRSAAuthentication }, | 318 | { "rsaauthentication", sRSAAuthentication }, |
323 | { "pubkeyauthentication", sPubkeyAuthentication }, | 319 | { "pubkeyauthentication", sPubkeyAuthentication }, |
324 | { "dsaauthentication", sPubkeyAuthentication }, /* alias */ | 320 | { "dsaauthentication", sPubkeyAuthentication }, /* alias */ |
321 | #if defined(KRB4) || defined(KRB5) | ||
325 | { "kerberosauthentication", sKerberosAuthentication }, | 322 | { "kerberosauthentication", sKerberosAuthentication }, |
326 | { "kerberosorlocalpasswd", sKerberosOrLocalPasswd }, | 323 | { "kerberosorlocalpasswd", sKerberosOrLocalPasswd }, |
327 | { "kerberosticketcleanup", sKerberosTicketCleanup }, | 324 | { "kerberosticketcleanup", sKerberosTicketCleanup }, |
328 | { "kerberostgtpassing", sKerberosTgtPassing }, | 325 | { "kerberostgtpassing", sKerberosTgtPassing }, |
326 | #else | ||
327 | { "kerberosauthentication", sUnsupported }, | ||
328 | { "kerberosorlocalpasswd", sUnsupported }, | ||
329 | { "kerberosticketcleanup", sUnsupported }, | ||
330 | { "kerberostgtpassing", sUnsupported }, | ||
331 | #endif | ||
332 | #if defined(AFS) | ||
329 | { "afstokenpassing", sAFSTokenPassing }, | 333 | { "afstokenpassing", sAFSTokenPassing }, |
334 | #else | ||
335 | { "afstokenpassing", sUnsupported }, | ||
336 | #endif | ||
330 | { "passwordauthentication", sPasswordAuthentication }, | 337 | { "passwordauthentication", sPasswordAuthentication }, |
331 | { "kbdinteractiveauthentication", sKbdInteractiveAuthentication }, | 338 | { "kbdinteractiveauthentication", sKbdInteractiveAuthentication }, |
332 | { "challengeresponseauthentication", sChallengeResponseAuthentication }, | 339 | { "challengeresponseauthentication", sChallengeResponseAuthentication }, |
@@ -899,6 +906,13 @@ parse_flag: | |||
899 | arg = strdelim(&cp); | 906 | arg = strdelim(&cp); |
900 | break; | 907 | break; |
901 | 908 | ||
909 | case sUnsupported: | ||
910 | logit("%s line %d: Unsupported option %s", | ||
911 | filename, linenum, arg); | ||
912 | while (arg) | ||
913 | arg = strdelim(&cp); | ||
914 | break; | ||
915 | |||
902 | default: | 916 | default: |
903 | fatal("%s line %d: Missing handler for opcode %s (%d)", | 917 | fatal("%s line %d: Missing handler for opcode %s (%d)", |
904 | filename, linenum, arg, opcode); | 918 | filename, linenum, arg, opcode); |