summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2016-01-15 01:30:36 +1100
committerDamien Miller <djm@mindrot.org>2016-01-15 01:30:36 +1100
commite6c85f8889c5c9eb04796fdb76d2807636b9eef5 (patch)
tree2edf4c5155e001cd9d6528b694ea10e8055a0e4b
parented4ce82dbfa8a3a3c8ea6fa0db113c71e234416c (diff)
forcibly disable roaming support in the client
-rw-r--r--readconf.c5
-rw-r--r--ssh.c3
2 files changed, 2 insertions, 6 deletions
diff --git a/readconf.c b/readconf.c
index 0a380913..dd678116 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1713,7 +1713,7 @@ initialize_options(Options * options)
options->tun_remote = -1;
options->local_command = NULL;
options->permit_local_command = -1;
- options->use_roaming = -1;
+ options->use_roaming = 0;
options->add_keys_to_agent = -1;
options->visual_host_key = -1;
options->ip_qos_interactive = -1;
@@ -1889,8 +1889,7 @@ fill_default_options(Options * options)
options->tun_remote = SSH_TUNID_ANY;
if (options->permit_local_command == -1)
options->permit_local_command = 0;
- if (options->use_roaming == -1)
- options->use_roaming = 1;
+ options->use_roaming = 0;
if (options->visual_host_key == -1)
options->visual_host_key = 0;
if (options->ip_qos_interactive == -1)
diff --git a/ssh.c b/ssh.c
index 096c5b5d..cf6eaebb 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1949,9 +1949,6 @@ ssh_session2(void)
fork_postauth();
}
- if (options.use_roaming)
- request_roaming();
-
return client_loop(tty_flag, tty_flag ?
options.escape_char : SSH_ESCAPECHAR_NONE, id);
}