diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/readconf.c b/readconf.c index 0bf5d7cb4..b6abeed06 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -127,6 +127,7 @@ 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 | oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey, | ||
130 | oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, | 131 | oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, |
131 | oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, | 132 | oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, |
132 | oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, | 133 | oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, |
@@ -164,10 +165,18 @@ static struct { | |||
164 | { "afstokenpassing", oUnsupported }, | 165 | { "afstokenpassing", oUnsupported }, |
165 | #if defined(GSSAPI) | 166 | #if defined(GSSAPI) |
166 | { "gssapiauthentication", oGssAuthentication }, | 167 | { "gssapiauthentication", oGssAuthentication }, |
168 | { "gssapikeyexchange", oGssKeyEx }, | ||
167 | { "gssapidelegatecredentials", oGssDelegateCreds }, | 169 | { "gssapidelegatecredentials", oGssDelegateCreds }, |
170 | { "gssapitrustdns", oGssTrustDns }, | ||
171 | { "gssapiclientidentity", oGssClientIdentity }, | ||
172 | { "gssapirenewalforcesrekey", oGssRenewalRekey }, | ||
168 | #else | 173 | #else |
169 | { "gssapiauthentication", oUnsupported }, | 174 | { "gssapiauthentication", oUnsupported }, |
175 | { "gssapikeyexchange", oUnsupported }, | ||
170 | { "gssapidelegatecredentials", oUnsupported }, | 176 | { "gssapidelegatecredentials", oUnsupported }, |
177 | { "gssapitrustdns", oUnsupported }, | ||
178 | { "gssapiclientidentity", oUnsupported }, | ||
179 | { "gssapirenewalforcesrekey", oUnsupported }, | ||
171 | #endif | 180 | #endif |
172 | { "fallbacktorsh", oDeprecated }, | 181 | { "fallbacktorsh", oDeprecated }, |
173 | { "usersh", oDeprecated }, | 182 | { "usersh", oDeprecated }, |
@@ -454,10 +463,26 @@ parse_flag: | |||
454 | intptr = &options->gss_authentication; | 463 | intptr = &options->gss_authentication; |
455 | goto parse_flag; | 464 | goto parse_flag; |
456 | 465 | ||
466 | case oGssKeyEx: | ||
467 | intptr = &options->gss_keyex; | ||
468 | goto parse_flag; | ||
469 | |||
457 | case oGssDelegateCreds: | 470 | case oGssDelegateCreds: |
458 | intptr = &options->gss_deleg_creds; | 471 | intptr = &options->gss_deleg_creds; |
459 | goto parse_flag; | 472 | goto parse_flag; |
460 | 473 | ||
474 | case oGssTrustDns: | ||
475 | intptr = &options->gss_trust_dns; | ||
476 | goto parse_flag; | ||
477 | |||
478 | case oGssClientIdentity: | ||
479 | charptr = &options->gss_client_identity; | ||
480 | goto parse_string; | ||
481 | |||
482 | case oGssRenewalRekey: | ||
483 | intptr = &options->gss_renewal_rekey; | ||
484 | goto parse_flag; | ||
485 | |||
461 | case oBatchMode: | 486 | case oBatchMode: |
462 | intptr = &options->batch_mode; | 487 | intptr = &options->batch_mode; |
463 | goto parse_flag; | 488 | goto parse_flag; |
@@ -1013,7 +1038,11 @@ initialize_options(Options * options) | |||
1013 | options->pubkey_authentication = -1; | 1038 | options->pubkey_authentication = -1; |
1014 | options->challenge_response_authentication = -1; | 1039 | options->challenge_response_authentication = -1; |
1015 | options->gss_authentication = -1; | 1040 | options->gss_authentication = -1; |
1041 | options->gss_keyex = -1; | ||
1016 | options->gss_deleg_creds = -1; | 1042 | options->gss_deleg_creds = -1; |
1043 | options->gss_trust_dns = -1; | ||
1044 | options->gss_renewal_rekey = -1; | ||
1045 | options->gss_client_identity = NULL; | ||
1017 | options->password_authentication = -1; | 1046 | options->password_authentication = -1; |
1018 | options->kbd_interactive_authentication = -1; | 1047 | options->kbd_interactive_authentication = -1; |
1019 | options->kbd_interactive_devices = NULL; | 1048 | options->kbd_interactive_devices = NULL; |
@@ -1105,8 +1134,14 @@ fill_default_options(Options * options) | |||
1105 | options->challenge_response_authentication = 1; | 1134 | options->challenge_response_authentication = 1; |
1106 | if (options->gss_authentication == -1) | 1135 | if (options->gss_authentication == -1) |
1107 | options->gss_authentication = 0; | 1136 | options->gss_authentication = 0; |
1137 | if (options->gss_keyex == -1) | ||
1138 | options->gss_keyex = 0; | ||
1108 | if (options->gss_deleg_creds == -1) | 1139 | if (options->gss_deleg_creds == -1) |
1109 | options->gss_deleg_creds = 0; | 1140 | options->gss_deleg_creds = 0; |
1141 | if (options->gss_trust_dns == -1) | ||
1142 | options->gss_trust_dns = 0; | ||
1143 | if (options->gss_renewal_rekey == -1) | ||
1144 | options->gss_renewal_rekey = 0; | ||
1110 | if (options->password_authentication == -1) | 1145 | if (options->password_authentication == -1) |
1111 | options->password_authentication = 1; | 1146 | options->password_authentication = 1; |
1112 | if (options->kbd_interactive_authentication == -1) | 1147 | if (options->kbd_interactive_authentication == -1) |