[openssh-commits] [openssh] 01/01: forcibly disable roaming support in the client

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit e6c85f8889c5c9eb04796fdb76d2807636b9eef5
Author: Damien Miller <djm at mindrot.org>
Date:   Fri Jan 15 01:30:36 2016 +1100

    forcibly disable roaming support in the client
---
 readconf.c | 5 ++---
 ssh.c      | 3 ---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/readconf.c b/readconf.c
index 0a38091..dd67811 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 096c5b5..cf6eaeb 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);
 }

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.