aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Smirnoff <glebius@FreeBSD.org>2016-01-14 22:53:07 +0000
committerGleb Smirnoff <glebius@FreeBSD.org>2016-01-14 22:53:07 +0000
commit2c8d95a1098aec52a7382ed533ef1735417dec3e (patch)
tree099afeacd070a736126057c5d4bb5aa8d638e3fd
parentb6dd8ce45df1801c33c3b5e0603af10d1074e5f6 (diff)
Notes
-rw-r--r--UPDATING4
-rw-r--r--crypto/openssh/readconf.c5
-rw-r--r--sys/conf/newvers.sh2
3 files changed, 7 insertions, 4 deletions
diff --git a/UPDATING b/UPDATING
index 4c470d7c9ff5..f828d65042ec 100644
--- a/UPDATING
+++ b/UPDATING
@@ -11,6 +11,10 @@ handbook:
Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before running portupgrade.
+20160114 p34 FreeBSD-SA-16:07.openssh
+
+ Fix OpenSSH client information leak. [SA-16:07]
+
20160114 p33 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 5f799d2d1896..673548eb384b 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;
@@ -1819,8 +1819,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 745d43d6bd8d..4c34bc2d7ca0 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -32,7 +32,7 @@
TYPE="FreeBSD"
REVISION="9.3"
-BRANCH="RELEASE-p33"
+BRANCH="RELEASE-p34"
if [ "X${BRANCH_OVERRIDE}" != "X" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi