summaryrefslogtreecommitdiff
path: root/servconf.c
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2006-05-12 09:46:51 +0000
committerColin Watson <cjwatson@debian.org>2006-05-12 09:46:51 +0000
commit2a3e00306c9b3b4db71a777a7c3ccb70e470c675 (patch)
treef00af0128b0ac750d739384f111000c1c97007e4 /servconf.c
parent2ee73b36b9a35daeaa4b065046882dc1f5f551b6 (diff)
* Update to current GSSAPI patch from
http://www.sxw.org.uk/computing/patches/openssh-4.3p2-gsskex-20060223.patch (closes: #352042).
Diffstat (limited to 'servconf.c')
-rw-r--r--servconf.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/servconf.c b/servconf.c
index 81953bb80..219a0300f 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;
@@ -187,6 +188,8 @@ fill_default_server_options(ServerOptions *options)
187 options->kerberos_get_afs_token = 0; 188 options->kerberos_get_afs_token = 0;
188 if (options->gss_authentication == -1) 189 if (options->gss_authentication == -1)
189 options->gss_authentication = 0; 190 options->gss_authentication = 0;
191 if (options->gss_keyex == -1)
192 options->gss_keyex = 0;
190 if (options->gss_cleanup_creds == -1) 193 if (options->gss_cleanup_creds == -1)
191 options->gss_cleanup_creds = 1; 194 options->gss_cleanup_creds = 1;
192 if (options->password_authentication == -1) 195 if (options->password_authentication == -1)
@@ -273,7 +276,8 @@ typedef enum {
273 sBanner, sUseDNS, sHostbasedAuthentication, 276 sBanner, sUseDNS, sHostbasedAuthentication,
274 sHostbasedUsesNameFromPacketOnly, sClientAliveInterval, 277 sHostbasedUsesNameFromPacketOnly, sClientAliveInterval,
275 sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2, 278 sClientAliveCountMax, sAuthorizedKeysFile, sAuthorizedKeysFile2,
276 sGssAuthentication, sGssCleanupCreds, sAcceptEnv, sPermitTunnel, 279 sGssAuthentication, sGssKeyEx, sGssCleanupCreds,
280 sAcceptEnv, sPermitTunnel,
277 sUsePrivilegeSeparation, 281 sUsePrivilegeSeparation,
278 sDeprecated, sUnsupported 282 sDeprecated, sUnsupported
279} ServerOpCodes; 283} ServerOpCodes;
@@ -327,9 +331,11 @@ static struct {
327 { "afstokenpassing", sUnsupported }, 331 { "afstokenpassing", sUnsupported },
328#ifdef GSSAPI 332#ifdef GSSAPI
329 { "gssapiauthentication", sGssAuthentication }, 333 { "gssapiauthentication", sGssAuthentication },
334 { "gssapikeyexchange", sGssKeyEx },
330 { "gssapicleanupcredentials", sGssCleanupCreds }, 335 { "gssapicleanupcredentials", sGssCleanupCreds },
331#else 336#else
332 { "gssapiauthentication", sUnsupported }, 337 { "gssapiauthentication", sUnsupported },
338 { "gssapikeyexchange", sUnsupported },
333 { "gssapicleanupcredentials", sUnsupported }, 339 { "gssapicleanupcredentials", sUnsupported },
334#endif 340#endif
335 { "passwordauthentication", sPasswordAuthentication }, 341 { "passwordauthentication", sPasswordAuthentication },
@@ -673,6 +679,10 @@ parse_flag:
673 intptr = &options->gss_authentication; 679 intptr = &options->gss_authentication;
674 goto parse_flag; 680 goto parse_flag;
675 681
682 case sGssKeyEx:
683 intptr = &options->gss_keyex;
684 goto parse_flag;
685
676 case sGssCleanupCreds: 686 case sGssCleanupCreds:
677 intptr = &options->gss_cleanup_creds; 687 intptr = &options->gss_cleanup_creds;
678 goto parse_flag; 688 goto parse_flag;