From 212b3ad703421b1316ee4a53432a1b08f4b60437 Mon Sep 17 00:00:00 2001
From: glebius <glebius@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Thu, 14 Jan 2016 22:47:54 +0000
Subject: [PATCH] Fix OpenSSH client information leak.

Security:       SA-16:07.openssh
Security:       CVE-2016-0777
Approved by:	so


git-svn-id: svn://svn.freebsd.org/base/releng/10.1@294051 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 UPDATING                  | 4 ++++
 crypto/openssh/readconf.c | 5 ++---
 sys/conf/newvers.sh       | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/UPDATING b/UPDATING
index 1d41ddc75..41479cdaa 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
 stable/10, and then rebuild without this option. The bootstrap process from
 older version of current is a bit fragile.
 
+20160114	p27	FreeBSD-SA-16:07.openssh
+
+	Fix OpenSSH client information leak. [SA-16:07]
+
 20160114	p26	FreeBSD-EN-16:02.pf
 			FreeBSD-EN-16:03.yplib
 			FreeBSD-SA-16:01.sctp
diff --git a/crypto/openssh/readconf.c b/crypto/openssh/readconf.c
index 9145b460e..16f62fea8 100644
--- a/crypto/openssh/readconf.c
+++ b/crypto/openssh/readconf.c
@@ -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)
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 00e08fc0e..7b3be89d9 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
 
 TYPE="FreeBSD"
 REVISION="10.1"
-BRANCH="RELEASE-p26"
+BRANCH="RELEASE-p27"
 if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.42.0