forcibly disable roaming support in the client

diff --git a/readconf.c b/readconf.c
index 0a380913f79f7fd3dfe86b2488697e66f34e3e4a..dd67811635513cc1b701e43cc19606649b8152e1 100644 (file)
--- 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 096c5b5d74f6b70eae52ccd7881b3758b9b5e714..cf6eaebb43981571772e95cf873a9d93e5e9823c 100644 (file)
--- 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);
 }