diff options
Diffstat (limited to 'readconf.c')
-rw-r--r-- | readconf.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/readconf.c b/readconf.c index bf1250738..8e9a25da7 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.247 2016/01/14 14:34:34 deraadt Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.248 2016/01/14 16:17:40 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -152,7 +152,7 @@ typedef enum { | |||
152 | oSendEnv, oControlPath, oControlMaster, oControlPersist, | 152 | oSendEnv, oControlPath, oControlMaster, oControlPersist, |
153 | oHashKnownHosts, | 153 | oHashKnownHosts, |
154 | oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, | 154 | oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, |
155 | oVisualHostKey, oUseRoaming, | 155 | oVisualHostKey, |
156 | oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, | 156 | oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, oProxyUseFdpass, |
157 | oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, | 157 | oCanonicalDomains, oCanonicalizeHostname, oCanonicalizeMaxDots, |
158 | oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, | 158 | oCanonicalizeFallbackLocal, oCanonicalizePermittedCNAMEs, |
@@ -263,7 +263,7 @@ static struct { | |||
263 | { "localcommand", oLocalCommand }, | 263 | { "localcommand", oLocalCommand }, |
264 | { "permitlocalcommand", oPermitLocalCommand }, | 264 | { "permitlocalcommand", oPermitLocalCommand }, |
265 | { "visualhostkey", oVisualHostKey }, | 265 | { "visualhostkey", oVisualHostKey }, |
266 | { "useroaming", oUseRoaming }, | 266 | { "useroaming", oDeprecated }, |
267 | { "kexalgorithms", oKexAlgorithms }, | 267 | { "kexalgorithms", oKexAlgorithms }, |
268 | { "ipqos", oIPQoS }, | 268 | { "ipqos", oIPQoS }, |
269 | { "requesttty", oRequestTTY }, | 269 | { "requesttty", oRequestTTY }, |
@@ -1425,10 +1425,6 @@ parse_keytypes: | |||
1425 | } | 1425 | } |
1426 | break; | 1426 | break; |
1427 | 1427 | ||
1428 | case oUseRoaming: | ||
1429 | intptr = &options->use_roaming; | ||
1430 | goto parse_flag; | ||
1431 | |||
1432 | case oRequestTTY: | 1428 | case oRequestTTY: |
1433 | intptr = &options->request_tty; | 1429 | intptr = &options->request_tty; |
1434 | multistate_ptr = multistate_requesttty; | 1430 | multistate_ptr = multistate_requesttty; |
@@ -1713,7 +1709,6 @@ initialize_options(Options * options) | |||
1713 | options->tun_remote = -1; | 1709 | options->tun_remote = -1; |
1714 | options->local_command = NULL; | 1710 | options->local_command = NULL; |
1715 | options->permit_local_command = -1; | 1711 | options->permit_local_command = -1; |
1716 | options->use_roaming = 0; | ||
1717 | options->add_keys_to_agent = -1; | 1712 | options->add_keys_to_agent = -1; |
1718 | options->visual_host_key = -1; | 1713 | options->visual_host_key = -1; |
1719 | options->ip_qos_interactive = -1; | 1714 | options->ip_qos_interactive = -1; |
@@ -1889,7 +1884,6 @@ fill_default_options(Options * options) | |||
1889 | options->tun_remote = SSH_TUNID_ANY; | 1884 | options->tun_remote = SSH_TUNID_ANY; |
1890 | if (options->permit_local_command == -1) | 1885 | if (options->permit_local_command == -1) |
1891 | options->permit_local_command = 0; | 1886 | options->permit_local_command = 0; |
1892 | options->use_roaming = 0; | ||
1893 | if (options->visual_host_key == -1) | 1887 | if (options->visual_host_key == -1) |
1894 | options->visual_host_key = 0; | 1888 | options->visual_host_key = 0; |
1895 | if (options->ip_qos_interactive == -1) | 1889 | if (options->ip_qos_interactive == -1) |