svn commit: r294049 - stable/10/crypto/openssh

[Gleb Smirnoff]

Author: glebius
Date: Thu Jan 14 22:42:43 2016
New Revision: 294049
URL: https://svnweb.freebsd.org/changeset/base/294049

Log:
  Merge r294048: fix OpenSSH client information leak.
  
  Security:	SA-16:07.openssh
  Security:	CVE-2016-0777

Modified:
  stable/10/crypto/openssh/readconf.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/crypto/openssh/readconf.c
==============================================================================
--- stable/10/crypto/openssh/readconf.c	Thu Jan 14 22:40:46 2016	(r294048)
+++ stable/10/crypto/openssh/readconf.c	Thu Jan 14 22:42:43 2016	(r294049)
@@ -1643,7 +1643,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;
@@ -1825,8 +1825,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)