summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/readconf.c b/readconf.c
index cf27a9f41..345df9c25 100644
--- a/readconf.c
+++ b/readconf.c
@@ -105,6 +105,7 @@ typedef enum {
105 oClearAllForwardings, oNoHostAuthenticationForLocalhost, 105 oClearAllForwardings, oNoHostAuthenticationForLocalhost,
106 oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, 106 oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
107 oAddressFamily, oGssAuthentication, oGssDelegateCreds, 107 oAddressFamily, oGssAuthentication, oGssDelegateCreds,
108 oGssTrustDns,
108 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, 109 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
109 oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, 110 oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
110 oDeprecated, oUnsupported 111 oDeprecated, oUnsupported
@@ -140,9 +141,11 @@ static struct {
140#if defined(GSSAPI) 141#if defined(GSSAPI)
141 { "gssapiauthentication", oGssAuthentication }, 142 { "gssapiauthentication", oGssAuthentication },
142 { "gssapidelegatecredentials", oGssDelegateCreds }, 143 { "gssapidelegatecredentials", oGssDelegateCreds },
144 { "gssapitrustdns", oGssTrustDns },
143#else 145#else
144 { "gssapiauthentication", oUnsupported }, 146 { "gssapiauthentication", oUnsupported },
145 { "gssapidelegatecredentials", oUnsupported }, 147 { "gssapidelegatecredentials", oUnsupported },
148 { "gssapitrustdns", oUnsupported },
146#endif 149#endif
147 { "fallbacktorsh", oDeprecated }, 150 { "fallbacktorsh", oDeprecated },
148 { "usersh", oDeprecated }, 151 { "usersh", oDeprecated },
@@ -410,6 +413,10 @@ parse_flag:
410 intptr = &options->gss_deleg_creds; 413 intptr = &options->gss_deleg_creds;
411 goto parse_flag; 414 goto parse_flag;
412 415
416 case oGssTrustDns:
417 intptr = &options->gss_trust_dns;
418 goto parse_flag;
419
413 case oBatchMode: 420 case oBatchMode:
414 intptr = &options->batch_mode; 421 intptr = &options->batch_mode;
415 goto parse_flag; 422 goto parse_flag;
@@ -917,6 +924,7 @@ initialize_options(Options * options)
917 options->challenge_response_authentication = -1; 924 options->challenge_response_authentication = -1;
918 options->gss_authentication = -1; 925 options->gss_authentication = -1;
919 options->gss_deleg_creds = -1; 926 options->gss_deleg_creds = -1;
927 options->gss_trust_dns = -1;
920 options->password_authentication = -1; 928 options->password_authentication = -1;
921 options->kbd_interactive_authentication = -1; 929 options->kbd_interactive_authentication = -1;
922 options->kbd_interactive_devices = NULL; 930 options->kbd_interactive_devices = NULL;
@@ -1000,6 +1008,8 @@ fill_default_options(Options * options)
1000 options->gss_authentication = 0; 1008 options->gss_authentication = 0;
1001 if (options->gss_deleg_creds == -1) 1009 if (options->gss_deleg_creds == -1)
1002 options->gss_deleg_creds = 0; 1010 options->gss_deleg_creds = 0;
1011 if (options->gss_trust_dns == -1)
1012 options->gss_trust_dns = 0;
1003 if (options->password_authentication == -1) 1013 if (options->password_authentication == -1)
1004 options->password_authentication = 1; 1014 options->password_authentication = 1;
1005 if (options->kbd_interactive_authentication == -1) 1015 if (options->kbd_interactive_authentication == -1)