diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/readconf.c b/readconf.c index 73f6eb361..3aedd6f5a 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -127,6 +127,8 @@ typedef enum { | |||
127 | oClearAllForwardings, oNoHostAuthenticationForLocalhost, | 127 | oClearAllForwardings, oNoHostAuthenticationForLocalhost, |
128 | oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, | 128 | oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, |
129 | oAddressFamily, oGssAuthentication, oGssDelegateCreds, | 129 | oAddressFamily, oGssAuthentication, oGssDelegateCreds, |
130 | oGssKeyEx, | ||
131 | oGssTrustDns, | ||
130 | oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, | 132 | oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, |
131 | oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, | 133 | oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, |
132 | oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, | 134 | oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, |
@@ -164,10 +166,14 @@ static struct { | |||
164 | { "afstokenpassing", oUnsupported }, | 166 | { "afstokenpassing", oUnsupported }, |
165 | #if defined(GSSAPI) | 167 | #if defined(GSSAPI) |
166 | { "gssapiauthentication", oGssAuthentication }, | 168 | { "gssapiauthentication", oGssAuthentication }, |
169 | { "gssapikeyexchange", oGssKeyEx }, | ||
167 | { "gssapidelegatecredentials", oGssDelegateCreds }, | 170 | { "gssapidelegatecredentials", oGssDelegateCreds }, |
171 | { "gssapitrustdns", oGssTrustDns }, | ||
168 | #else | 172 | #else |
169 | { "gssapiauthentication", oUnsupported }, | 173 | { "gssapiauthentication", oUnsupported }, |
174 | { "gssapikeyexchange", oUnsupported }, | ||
170 | { "gssapidelegatecredentials", oUnsupported }, | 175 | { "gssapidelegatecredentials", oUnsupported }, |
176 | { "gssapitrustdns", oUnsupported }, | ||
171 | #endif | 177 | #endif |
172 | { "fallbacktorsh", oDeprecated }, | 178 | { "fallbacktorsh", oDeprecated }, |
173 | { "usersh", oDeprecated }, | 179 | { "usersh", oDeprecated }, |
@@ -444,10 +450,18 @@ parse_flag: | |||
444 | intptr = &options->gss_authentication; | 450 | intptr = &options->gss_authentication; |
445 | goto parse_flag; | 451 | goto parse_flag; |
446 | 452 | ||
453 | case oGssKeyEx: | ||
454 | intptr = &options->gss_keyex; | ||
455 | goto parse_flag; | ||
456 | |||
447 | case oGssDelegateCreds: | 457 | case oGssDelegateCreds: |
448 | intptr = &options->gss_deleg_creds; | 458 | intptr = &options->gss_deleg_creds; |
449 | goto parse_flag; | 459 | goto parse_flag; |
450 | 460 | ||
461 | case oGssTrustDns: | ||
462 | intptr = &options->gss_trust_dns; | ||
463 | goto parse_flag; | ||
464 | |||
451 | case oBatchMode: | 465 | case oBatchMode: |
452 | intptr = &options->batch_mode; | 466 | intptr = &options->batch_mode; |
453 | goto parse_flag; | 467 | goto parse_flag; |
@@ -1016,7 +1030,9 @@ initialize_options(Options * options) | |||
1016 | options->pubkey_authentication = -1; | 1030 | options->pubkey_authentication = -1; |
1017 | options->challenge_response_authentication = -1; | 1031 | options->challenge_response_authentication = -1; |
1018 | options->gss_authentication = -1; | 1032 | options->gss_authentication = -1; |
1033 | options->gss_keyex = -1; | ||
1019 | options->gss_deleg_creds = -1; | 1034 | options->gss_deleg_creds = -1; |
1035 | options->gss_trust_dns = -1; | ||
1020 | options->password_authentication = -1; | 1036 | options->password_authentication = -1; |
1021 | options->kbd_interactive_authentication = -1; | 1037 | options->kbd_interactive_authentication = -1; |
1022 | options->kbd_interactive_devices = NULL; | 1038 | options->kbd_interactive_devices = NULL; |
@@ -1106,8 +1122,12 @@ fill_default_options(Options * options) | |||
1106 | options->challenge_response_authentication = 1; | 1122 | options->challenge_response_authentication = 1; |
1107 | if (options->gss_authentication == -1) | 1123 | if (options->gss_authentication == -1) |
1108 | options->gss_authentication = 0; | 1124 | options->gss_authentication = 0; |
1125 | if (options->gss_keyex == -1) | ||
1126 | options->gss_keyex = 0; | ||
1109 | if (options->gss_deleg_creds == -1) | 1127 | if (options->gss_deleg_creds == -1) |
1110 | options->gss_deleg_creds = 0; | 1128 | options->gss_deleg_creds = 0; |
1129 | if (options->gss_trust_dns == -1) | ||
1130 | options->gss_trust_dns = 0; | ||
1111 | if (options->password_authentication == -1) | 1131 | if (options->password_authentication == -1) |
1112 | options->password_authentication = 1; | 1132 | options->password_authentication = 1; |
1113 | if (options->kbd_interactive_authentication == -1) | 1133 | if (options->kbd_interactive_authentication == -1) |