diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/readconf.c b/readconf.c index 7948ce1cd..9127e9324 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -142,6 +142,8 @@ typedef enum { | |||
142 | oClearAllForwardings, oNoHostAuthenticationForLocalhost, | 142 | oClearAllForwardings, oNoHostAuthenticationForLocalhost, |
143 | oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, | 143 | oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, |
144 | oAddressFamily, oGssAuthentication, oGssDelegateCreds, | 144 | oAddressFamily, oGssAuthentication, oGssDelegateCreds, |
145 | oGssTrustDns, oGssKeyEx, oGssClientIdentity, oGssRenewalRekey, | ||
146 | oGssServerIdentity, | ||
145 | oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, | 147 | oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, |
146 | oSendEnv, oControlPath, oControlMaster, oControlPersist, | 148 | oSendEnv, oControlPath, oControlMaster, oControlPersist, |
147 | oHashKnownHosts, | 149 | oHashKnownHosts, |
@@ -185,10 +187,19 @@ static struct { | |||
185 | { "afstokenpassing", oUnsupported }, | 187 | { "afstokenpassing", oUnsupported }, |
186 | #if defined(GSSAPI) | 188 | #if defined(GSSAPI) |
187 | { "gssapiauthentication", oGssAuthentication }, | 189 | { "gssapiauthentication", oGssAuthentication }, |
190 | { "gssapikeyexchange", oGssKeyEx }, | ||
188 | { "gssapidelegatecredentials", oGssDelegateCreds }, | 191 | { "gssapidelegatecredentials", oGssDelegateCreds }, |
192 | { "gssapitrustdns", oGssTrustDns }, | ||
193 | { "gssapiclientidentity", oGssClientIdentity }, | ||
194 | { "gssapiserveridentity", oGssServerIdentity }, | ||
195 | { "gssapirenewalforcesrekey", oGssRenewalRekey }, | ||
189 | #else | 196 | #else |
190 | { "gssapiauthentication", oUnsupported }, | 197 | { "gssapiauthentication", oUnsupported }, |
198 | { "gssapikeyexchange", oUnsupported }, | ||
191 | { "gssapidelegatecredentials", oUnsupported }, | 199 | { "gssapidelegatecredentials", oUnsupported }, |
200 | { "gssapitrustdns", oUnsupported }, | ||
201 | { "gssapiclientidentity", oUnsupported }, | ||
202 | { "gssapirenewalforcesrekey", oUnsupported }, | ||
192 | #endif | 203 | #endif |
193 | { "fallbacktorsh", oDeprecated }, | 204 | { "fallbacktorsh", oDeprecated }, |
194 | { "usersh", oDeprecated }, | 205 | { "usersh", oDeprecated }, |
@@ -865,10 +876,30 @@ parse_time: | |||
865 | intptr = &options->gss_authentication; | 876 | intptr = &options->gss_authentication; |
866 | goto parse_flag; | 877 | goto parse_flag; |
867 | 878 | ||
879 | case oGssKeyEx: | ||
880 | intptr = &options->gss_keyex; | ||
881 | goto parse_flag; | ||
882 | |||
868 | case oGssDelegateCreds: | 883 | case oGssDelegateCreds: |
869 | intptr = &options->gss_deleg_creds; | 884 | intptr = &options->gss_deleg_creds; |
870 | goto parse_flag; | 885 | goto parse_flag; |
871 | 886 | ||
887 | case oGssTrustDns: | ||
888 | intptr = &options->gss_trust_dns; | ||
889 | goto parse_flag; | ||
890 | |||
891 | case oGssClientIdentity: | ||
892 | charptr = &options->gss_client_identity; | ||
893 | goto parse_string; | ||
894 | |||
895 | case oGssServerIdentity: | ||
896 | charptr = &options->gss_server_identity; | ||
897 | goto parse_string; | ||
898 | |||
899 | case oGssRenewalRekey: | ||
900 | intptr = &options->gss_renewal_rekey; | ||
901 | goto parse_flag; | ||
902 | |||
872 | case oBatchMode: | 903 | case oBatchMode: |
873 | intptr = &options->batch_mode; | 904 | intptr = &options->batch_mode; |
874 | goto parse_flag; | 905 | goto parse_flag; |
@@ -1538,7 +1569,12 @@ initialize_options(Options * options) | |||
1538 | options->pubkey_authentication = -1; | 1569 | options->pubkey_authentication = -1; |
1539 | options->challenge_response_authentication = -1; | 1570 | options->challenge_response_authentication = -1; |
1540 | options->gss_authentication = -1; | 1571 | options->gss_authentication = -1; |
1572 | options->gss_keyex = -1; | ||
1541 | options->gss_deleg_creds = -1; | 1573 | options->gss_deleg_creds = -1; |
1574 | options->gss_trust_dns = -1; | ||
1575 | options->gss_renewal_rekey = -1; | ||
1576 | options->gss_client_identity = NULL; | ||
1577 | options->gss_server_identity = NULL; | ||
1542 | options->password_authentication = -1; | 1578 | options->password_authentication = -1; |
1543 | options->kbd_interactive_authentication = -1; | 1579 | options->kbd_interactive_authentication = -1; |
1544 | options->kbd_interactive_devices = NULL; | 1580 | options->kbd_interactive_devices = NULL; |
@@ -1661,8 +1697,14 @@ fill_default_options(Options * options) | |||
1661 | options->challenge_response_authentication = 1; | 1697 | options->challenge_response_authentication = 1; |
1662 | if (options->gss_authentication == -1) | 1698 | if (options->gss_authentication == -1) |
1663 | options->gss_authentication = 0; | 1699 | options->gss_authentication = 0; |
1700 | if (options->gss_keyex == -1) | ||
1701 | options->gss_keyex = 0; | ||
1664 | if (options->gss_deleg_creds == -1) | 1702 | if (options->gss_deleg_creds == -1) |
1665 | options->gss_deleg_creds = 0; | 1703 | options->gss_deleg_creds = 0; |
1704 | if (options->gss_trust_dns == -1) | ||
1705 | options->gss_trust_dns = 0; | ||
1706 | if (options->gss_renewal_rekey == -1) | ||
1707 | options->gss_renewal_rekey = 0; | ||
1666 | if (options->password_authentication == -1) | 1708 | if (options->password_authentication == -1) |
1667 | options->password_authentication = 1; | 1709 | options->password_authentication = 1; |
1668 | if (options->kbd_interactive_authentication == -1) | 1710 | if (options->kbd_interactive_authentication == -1) |