diff options
Diffstat (limited to 'servconf.c')
-rw-r--r-- | servconf.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/servconf.c b/servconf.c index 9e420a527..becd5b7c5 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -72,6 +72,7 @@ initialize_server_options(ServerOptions *options) | |||
72 | options->kerberos_ticket_cleanup = -1; | 72 | options->kerberos_ticket_cleanup = -1; |
73 | options->kerberos_get_afs_token = -1; | 73 | options->kerberos_get_afs_token = -1; |
74 | options->gss_authentication=-1; | 74 | options->gss_authentication=-1; |
75 | options->gss_keyex = -1; | ||
75 | options->gss_cleanup_creds = -1; | 76 | options->gss_cleanup_creds = -1; |
76 | options->password_authentication = -1; | 77 | options->password_authentication = -1; |
77 | options->kbd_interactive_authentication = -1; | 78 | options->kbd_interactive_authentication = -1; |
@@ -186,6 +187,8 @@ fill_default_server_options(ServerOptions *options) | |||
186 | options->kerberos_get_afs_token = 0; | 187 | options->kerberos_get_afs_token = 0; |
187 | if (options->gss_authentication == -1) | 188 | if (options->gss_authentication == -1) |
188 | options->gss_authentication = 0; | 189 | options->gss_authentication = 0; |
190 | if (options->gss_keyex == -1) | ||
191 | options->gss_keyex = 0; | ||
189 | if (options->gss_cleanup_creds == -1) | 192 | if (options->gss_cleanup_creds == -1) |
190 | options->gss_cleanup_creds = 1; | 193 | options->gss_cleanup_creds = 1; |
191 | if (options->password_authentication == -1) | 194 | if (options->password_authentication == -1) |
@@ -270,7 +273,7 @@ typedef enum { | |||
270 | sBanner, sUseDNS, sHostbasedAuthentication, | 273 | sBanner, sUseDNS, sHostbasedAuthentication, |
271 | sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, | 274 | sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, |
272 | sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, | 275 | sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, |
273 | sGssAuthentication, sGssCleanupCreds, sAcceptEnv, | 276 | sGssAuthentication, sGssKeyEx, sGssCleanupCreds, sAcceptEnv, |
274 | sUsePrivilegeSeparation, | 277 | sUsePrivilegeSeparation, |
275 | sDeprecated, sUnsupported | 278 | sDeprecated, sUnsupported |
276 | } ServerOpCodes; | 279 | } ServerOpCodes; |
@@ -324,9 +327,11 @@ static struct { | |||
324 | { "afstokenpassing", sUnsupported }, | 327 | { "afstokenpassing", sUnsupported }, |
325 | #ifdef GSSAPI | 328 | #ifdef GSSAPI |
326 | { "gssapiauthentication", sGssAuthentication }, | 329 | { "gssapiauthentication", sGssAuthentication }, |
330 | { "gssapikeyexchange", sGssKeyEx }, | ||
327 | { "gssapicleanupcredentials", sGssCleanupCreds }, | 331 | { "gssapicleanupcredentials", sGssCleanupCreds }, |
328 | #else | 332 | #else |
329 | { "gssapiauthentication", sUnsupported }, | 333 | { "gssapiauthentication", sUnsupported }, |
334 | { "gssapikeyexchange", sUnsupported }, | ||
330 | { "gssapicleanupcredentials", sUnsupported }, | 335 | { "gssapicleanupcredentials", sUnsupported }, |
331 | #endif | 336 | #endif |
332 | { "passwordauthentication", sPasswordAuthentication }, | 337 | { "passwordauthentication", sPasswordAuthentication }, |
@@ -669,6 +674,10 @@ parse_flag: | |||
669 | intptr = &options->gss_authentication; | 674 | intptr = &options->gss_authentication; |
670 | goto parse_flag; | 675 | goto parse_flag; |
671 | 676 | ||
677 | case sGssKeyEx: | ||
678 | intptr = &options->gss_keyex; | ||
679 | goto parse_flag; | ||
680 | |||
672 | case sGssCleanupCreds: | 681 | case sGssCleanupCreds: |
673 | intptr = &options->gss_cleanup_creds; | 682 | intptr = &options->gss_cleanup_creds; |
674 | goto parse_flag; | 683 | goto parse_flag; |