forcibly disable roaming support in the client

2 files changed, 2 insertions, 6 deletions

diff --git a/readconf.c b/readconf.c
index 1d03bdf72..cd014821a 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1660,7 +1660,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->visual_host_key = -1;
         options->ip_qos_interactive = -1;
         options->ip_qos_bulk = -1;
@@ -1833,8 +1833,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 59c1f931c..67c1ebfa2 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1932,9 +1932,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);
 }