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 7933c5289..b3e14b9d2 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,
@@ -146,9 +147,11 @@ static struct {
146#if defined(GSSAPI) 147#if defined(GSSAPI)
147 { "gssapiauthentication", oGssAuthentication }, 148 { "gssapiauthentication", oGssAuthentication },
148 { "gssapidelegatecredentials", oGssDelegateCreds }, 149 { "gssapidelegatecredentials", oGssDelegateCreds },
150 { "gssapitrustdns", oGssTrustDns },
149#else 151#else
150 { "gssapiauthentication", oUnsupported }, 152 { "gssapiauthentication", oUnsupported },
151 { "gssapidelegatecredentials", oUnsupported }, 153 { "gssapidelegatecredentials", oUnsupported },
154 { "gssapitrustdns", oUnsupported },
152#endif 155#endif
153 { "fallbacktorsh", oDeprecated }, 156 { "fallbacktorsh", oDeprecated },
154 { "usersh", oDeprecated }, 157 { "usersh", oDeprecated },
@@ -423,6 +426,10 @@ parse_flag:
423 intptr = &options->gss_deleg_creds; 426 intptr = &options->gss_deleg_creds;
424 goto parse_flag; 427 goto parse_flag;
425 428
429 case oGssTrustDns:
430 intptr = &options->gss_trust_dns;
431 goto parse_flag;
432
426 case oBatchMode: 433 case oBatchMode:
427 intptr = &options->batch_mode; 434 intptr = &options->batch_mode;
428 goto parse_flag; 435 goto parse_flag;
@@ -998,6 +1005,7 @@ initialize_options(Options * options)
998 options->challenge_response_authentication = -1; 1005 options->challenge_response_authentication = -1;
999 options->gss_authentication = -1; 1006 options->gss_authentication = -1;
1000 options->gss_deleg_creds = -1; 1007 options->gss_deleg_creds = -1;
1008 options->gss_trust_dns = -1;
1001 options->password_authentication = -1; 1009 options->password_authentication = -1;
1002 options->kbd_interactive_authentication = -1; 1010 options->kbd_interactive_authentication = -1;
1003 options->kbd_interactive_devices = NULL; 1011 options->kbd_interactive_devices = NULL;
@@ -1087,6 +1095,8 @@ fill_default_options(Options * options)
1087 options->gss_authentication = 0; 1095 options->gss_authentication = 0;
1088 if (options->gss_deleg_creds == -1) 1096 if (options->gss_deleg_creds == -1)
1089 options->gss_deleg_creds = 0; 1097 options->gss_deleg_creds = 0;
1098 if (options->gss_trust_dns == -1)
1099 options->gss_trust_dns = 0;
1090 if (options->password_authentication == -1) 1100 if (options->password_authentication == -1)
1091 options->password_authentication = 1; 1101 options->password_authentication = 1;
1092 if (options->kbd_interactive_authentication == -1) 1102 if (options->kbd_interactive_authentication == -1)