Author: glebius
Date: Thu Jan 14 22:50:35 2016
New Revision: 294053
URL: https://svnweb.freebsd.org/changeset/base/294053

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

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

Modified: stable/9/crypto/openssh/readconf.c
==============================================================================
--- stable/9/crypto/openssh/readconf.c  Thu Jan 14 22:48:13 2016        
(r294052)
+++ stable/9/crypto/openssh/readconf.c  Thu Jan 14 22:50:35 2016        
(r294053)
@@ -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)
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"

Reply via email to