diff options
-rw-r--r-- | readconf.c | 5 | ||||
-rw-r--r-- | ssh.c | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/readconf.c b/readconf.c index 0a380913f..dd6781163 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1713,7 +1713,7 @@ initialize_options(Options * options) | |||
1713 | options->tun_remote = -1; | 1713 | options->tun_remote = -1; |
1714 | options->local_command = NULL; | 1714 | options->local_command = NULL; |
1715 | options->permit_local_command = -1; | 1715 | options->permit_local_command = -1; |
1716 | options->use_roaming = -1; | 1716 | options->use_roaming = 0; |
1717 | options->add_keys_to_agent = -1; | 1717 | options->add_keys_to_agent = -1; |
1718 | options->visual_host_key = -1; | 1718 | options->visual_host_key = -1; |
1719 | options->ip_qos_interactive = -1; | 1719 | options->ip_qos_interactive = -1; |
@@ -1889,8 +1889,7 @@ fill_default_options(Options * options) | |||
1889 | options->tun_remote = SSH_TUNID_ANY; | 1889 | options->tun_remote = SSH_TUNID_ANY; |
1890 | if (options->permit_local_command == -1) | 1890 | if (options->permit_local_command == -1) |
1891 | options->permit_local_command = 0; | 1891 | options->permit_local_command = 0; |
1892 | if (options->use_roaming == -1) | 1892 | options->use_roaming = 0; |
1893 | options->use_roaming = 1; | ||
1894 | if (options->visual_host_key == -1) | 1893 | if (options->visual_host_key == -1) |
1895 | options->visual_host_key = 0; | 1894 | options->visual_host_key = 0; |
1896 | if (options->ip_qos_interactive == -1) | 1895 | if (options->ip_qos_interactive == -1) |
@@ -1949,9 +1949,6 @@ ssh_session2(void) | |||
1949 | fork_postauth(); | 1949 | fork_postauth(); |
1950 | } | 1950 | } |
1951 | 1951 | ||
1952 | if (options.use_roaming) | ||
1953 | request_roaming(); | ||
1954 | |||
1955 | return client_loop(tty_flag, tty_flag ? | 1952 | return client_loop(tty_flag, tty_flag ? |
1956 | options.escape_char : SSH_ESCAPECHAR_NONE, id); | 1953 | options.escape_char : SSH_ESCAPECHAR_NONE, id); |
1957 | } | 1954 | } |