diff options
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/servconf.c b/servconf.c index 2aa516b2a..3ce2397c3 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -381,16 +381,20 @@ static struct { | |||
381 | #ifdef GSSAPI | 381 | #ifdef GSSAPI |
382 | { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, | 382 | { "gssapiauthentication", sGssAuthentication, SSHCFG_ALL }, |
383 | { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, | 383 | { "gssapicleanupcredentials", sGssCleanupCreds, SSHCFG_GLOBAL }, |
384 | { "gssapicleanupcreds", sGssCleanupCreds, SSHCFG_GLOBAL }, | ||
384 | { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL }, | 385 | { "gssapistrictacceptorcheck", sGssStrictAcceptor, SSHCFG_GLOBAL }, |
385 | { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL }, | 386 | { "gssapikeyexchange", sGssKeyEx, SSHCFG_GLOBAL }, |
386 | { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL }, | 387 | { "gssapistorecredentialsonrekey", sGssStoreRekey, SSHCFG_GLOBAL }, |
387 | #else | 388 | #else |
388 | { "gssapiauthentication", sUnsupported, SSHCFG_ALL }, | 389 | { "gssapiauthentication", sUnsupported, SSHCFG_ALL }, |
389 | { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL }, | 390 | { "gssapicleanupcredentials", sUnsupported, SSHCFG_GLOBAL }, |
391 | { "gssapicleanupcreds", sUnsupported, SSHCFG_GLOBAL }, | ||
390 | { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL }, | 392 | { "gssapistrictacceptorcheck", sUnsupported, SSHCFG_GLOBAL }, |
391 | { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL }, | 393 | { "gssapikeyexchange", sUnsupported, SSHCFG_GLOBAL }, |
392 | { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL }, | 394 | { "gssapistorecredentialsonrekey", sUnsupported, SSHCFG_GLOBAL }, |
393 | #endif | 395 | #endif |
396 | { "gssusesessionccache", sUnsupported, SSHCFG_GLOBAL }, | ||
397 | { "gssapiusesessioncredcache", sUnsupported, SSHCFG_GLOBAL }, | ||
394 | { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, | 398 | { "passwordauthentication", sPasswordAuthentication, SSHCFG_ALL }, |
395 | { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, | 399 | { "kbdinteractiveauthentication", sKbdInteractiveAuthentication, SSHCFG_ALL }, |
396 | { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL }, | 400 | { "challengeresponseauthentication", sChallengeResponseAuthentication, SSHCFG_GLOBAL }, |
@@ -1684,7 +1688,10 @@ dump_config(ServerOptions *o) | |||
1684 | #endif | 1688 | #endif |
1685 | #ifdef GSSAPI | 1689 | #ifdef GSSAPI |
1686 | dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); | 1690 | dump_cfg_fmtint(sGssAuthentication, o->gss_authentication); |
1691 | dump_cfg_fmtint(sGssKeyEx, o->gss_keyex); | ||
1687 | dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); | 1692 | dump_cfg_fmtint(sGssCleanupCreds, o->gss_cleanup_creds); |
1693 | dump_cfg_fmtint(sGssStrictAcceptor, o->gss_strict_acceptor); | ||
1694 | dump_cfg_fmtint(sGssStoreRekey, o->gss_store_rekey); | ||
1688 | #endif | 1695 | #endif |
1689 | #ifdef JPAKE | 1696 | #ifdef JPAKE |
1690 | dump_cfg_fmtint(sZeroKnowledgePasswordAuthentication, | 1697 | dump_cfg_fmtint(sZeroKnowledgePasswordAuthentication, |