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 53fc6c7ba..484db3e5f 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 }, |
@@ -453,10 +462,26 @@ parse_flag: | |||
453 | intptr = &options->gss_authentication; | 462 | intptr = &options->gss_authentication; |
454 | goto parse_flag; | 463 | goto parse_flag; |
455 | 464 | ||
465 | case oGssKeyEx: | ||
466 | intptr = &options->gss_keyex; | ||
467 | goto parse_flag; | ||
468 | |||
456 | case oGssDelegateCreds: | 469 | case oGssDelegateCreds: |
457 | intptr = &options->gss_deleg_creds; | 470 | intptr = &options->gss_deleg_creds; |
458 | goto parse_flag; | 471 | goto parse_flag; |
459 | 472 | ||
473 | case oGssTrustDns: | ||
474 | intptr = &options->gss_trust_dns; | ||
475 | goto parse_flag; | ||
476 | |||
477 | case oGssClientIdentity: | ||
478 | charptr = &options->gss_client_identity; | ||
479 | goto parse_string; | ||
480 | |||
481 | case oGssRenewalRekey: | ||
482 | intptr = &options->gss_renewal_rekey; | ||
483 | goto parse_flag; | ||
484 | |||
460 | case oBatchMode: | 485 | case oBatchMode: |
461 | intptr = &options->batch_mode; | 486 | intptr = &options->batch_mode; |
462 | goto parse_flag; | 487 | goto parse_flag; |
@@ -1008,7 +1033,11 @@ initialize_options(Options * options) | |||
1008 | options->pubkey_authentication = -1; | 1033 | options->pubkey_authentication = -1; |
1009 | options->challenge_response_authentication = -1; | 1034 | options->challenge_response_authentication = -1; |
1010 | options->gss_authentication = -1; | 1035 | options->gss_authentication = -1; |
1036 | options->gss_keyex = -1; | ||
1011 | options->gss_deleg_creds = -1; | 1037 | options->gss_deleg_creds = -1; |
1038 | options->gss_trust_dns = -1; | ||
1039 | options->gss_renewal_rekey = -1; | ||
1040 | options->gss_client_identity = NULL; | ||
1012 | options->password_authentication = -1; | 1041 | options->password_authentication = -1; |
1013 | options->kbd_interactive_authentication = -1; | 1042 | options->kbd_interactive_authentication = -1; |
1014 | options->kbd_interactive_devices = NULL; | 1043 | options->kbd_interactive_devices = NULL; |
@@ -1099,8 +1128,14 @@ fill_default_options(Options * options) | |||
1099 | options->challenge_response_authentication = 1; | 1128 | options->challenge_response_authentication = 1; |
1100 | if (options->gss_authentication == -1) | 1129 | if (options->gss_authentication == -1) |
1101 | options->gss_authentication = 0; | 1130 | options->gss_authentication = 0; |
1131 | if (options->gss_keyex == -1) | ||
1132 | options->gss_keyex = 0; | ||
1102 | if (options->gss_deleg_creds == -1) | 1133 | if (options->gss_deleg_creds == -1) |
1103 | options->gss_deleg_creds = 0; | 1134 | options->gss_deleg_creds = 0; |
1135 | if (options->gss_trust_dns == -1) | ||
1136 | options->gss_trust_dns = 0; | ||
1137 | if (options->gss_renewal_rekey == -1) | ||
1138 | options->gss_renewal_rekey = 0; | ||
1104 | if (options->password_authentication == -1) | 1139 | if (options->password_authentication == -1) |
1105 | options->password_authentication = 1; | 1140 | options->password_authentication = 1; |
1106 | if (options->kbd_interactive_authentication == -1) | 1141 | if (options->kbd_interactive_authentication == -1) |