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 1fbf59793..355a41ccb 100644
--- a/readconf.c
+++ b/readconf.c
@@ -109,6 +109,7 @@ typedef enum {
109 oClearAllForwardings, oNoHostAuthenticationForLocalhost, 109 oClearAllForwardings, oNoHostAuthenticationForLocalhost,
110 oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout, 110 oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
111 oAddressFamily, oGssAuthentication, oGssDelegateCreds, 111 oAddressFamily, oGssAuthentication, oGssDelegateCreds,
112 oGssTrustDns,
112 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly, 113 oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
113 oSendEnv, oControlPath, oControlMaster, oHashKnownHosts, 114 oSendEnv, oControlPath, oControlMaster, oHashKnownHosts,
114 oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, 115 oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand,
@@ -145,9 +146,11 @@ static struct {
145#if defined(GSSAPI) 146#if defined(GSSAPI)
146 { "gssapiauthentication", oGssAuthentication }, 147 { "gssapiauthentication", oGssAuthentication },
147 { "gssapidelegatecredentials", oGssDelegateCreds }, 148 { "gssapidelegatecredentials", oGssDelegateCreds },
149 { "gssapitrustdns", oGssTrustDns },
148#else 150#else
149 { "gssapiauthentication", oUnsupported }, 151 { "gssapiauthentication", oUnsupported },
150 { "gssapidelegatecredentials", oUnsupported }, 152 { "gssapidelegatecredentials", oUnsupported },
153 { "gssapitrustdns", oUnsupported },
151#endif 154#endif
152 { "fallbacktorsh", oDeprecated }, 155 { "fallbacktorsh", oDeprecated },
153 { "usersh", oDeprecated }, 156 { "usersh", oDeprecated },
@@ -420,6 +423,10 @@ parse_flag:
420 intptr = &options->gss_deleg_creds; 423 intptr = &options->gss_deleg_creds;
421 goto parse_flag; 424 goto parse_flag;
422 425
426 case oGssTrustDns:
427 intptr = &options->gss_trust_dns;
428 goto parse_flag;
429
423 case oBatchMode: 430 case oBatchMode:
424 intptr = &options->batch_mode; 431 intptr = &options->batch_mode;
425 goto parse_flag; 432 goto parse_flag;
@@ -971,6 +978,7 @@ initialize_options(Options * options)
971 options->challenge_response_authentication = -1; 978 options->challenge_response_authentication = -1;
972 options->gss_authentication = -1; 979 options->gss_authentication = -1;
973 options->gss_deleg_creds = -1; 980 options->gss_deleg_creds = -1;
981 options->gss_trust_dns = -1;
974 options->password_authentication = -1; 982 options->password_authentication = -1;
975 options->kbd_interactive_authentication = -1; 983 options->kbd_interactive_authentication = -1;
976 options->kbd_interactive_devices = NULL; 984 options->kbd_interactive_devices = NULL;
@@ -1059,6 +1067,8 @@ fill_default_options(Options * options)
1059 options->gss_authentication = 0; 1067 options->gss_authentication = 0;
1060 if (options->gss_deleg_creds == -1) 1068 if (options->gss_deleg_creds == -1)
1061 options->gss_deleg_creds = 0; 1069 options->gss_deleg_creds = 0;
1070 if (options->gss_trust_dns == -1)
1071 options->gss_trust_dns = 0;
1062 if (options->password_authentication == -1) 1072 if (options->password_authentication == -1)
1063 options->password_authentication = 1; 1073 options->password_authentication = 1;
1064 if (options->kbd_interactive_authentication == -1) 1074 if (options->kbd_interactive_authentication == -1)