From owner-svn-src-stable-8@FreeBSD.ORG Fri Jun 28 10:21:50 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 6AACDC69; Fri, 28 Jun 2013 10:21:50 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 430901030; Fri, 28 Jun 2013 10:21:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5SALoWJ011423; Fri, 28 Jun 2013 10:21:50 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5SALn0p011420; Fri, 28 Jun 2013 10:21:49 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201306281021.r5SALn0p011420@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Fri, 28 Jun 2013 10:21:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r252340 - stable/8/crypto/openssh X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Jun 2013 10:21:50 -0000 Author: des Date: Fri Jun 28 10:21:49 2013 New Revision: 252340 URL: http://svnweb.freebsd.org/changeset/base/252340 Log: MFH (r251088, r252338): revert default privsep setting to "yes" Modified: stable/8/crypto/openssh/servconf.c stable/8/crypto/openssh/sshd_config stable/8/crypto/openssh/sshd_config.5 Directory Properties: stable/8/crypto/openssh/ (props changed) Modified: stable/8/crypto/openssh/servconf.c ============================================================================== --- stable/8/crypto/openssh/servconf.c Fri Jun 28 09:55:00 2013 (r252339) +++ stable/8/crypto/openssh/servconf.c Fri Jun 28 10:21:49 2013 (r252340) @@ -294,7 +294,7 @@ fill_default_server_options(ServerOption options->version_addendum = xstrdup(SSH_VERSION_FREEBSD); /* Turn privilege separation on by default */ if (use_privsep == -1) - use_privsep = PRIVSEP_ON; + use_privsep = PRIVSEP_NOSANDBOX; #ifndef HAVE_MMAP if (use_privsep && options->compression == 1) { Modified: stable/8/crypto/openssh/sshd_config ============================================================================== --- stable/8/crypto/openssh/sshd_config Fri Jun 28 09:55:00 2013 (r252339) +++ stable/8/crypto/openssh/sshd_config Fri Jun 28 10:21:49 2013 (r252340) @@ -102,7 +102,7 @@ #PrintLastLog yes #TCPKeepAlive yes #UseLogin no -#UsePrivilegeSeparation sandbox +#UsePrivilegeSeparation yes #PermitUserEnvironment no #Compression delayed #ClientAliveInterval 0 Modified: stable/8/crypto/openssh/sshd_config.5 ============================================================================== --- stable/8/crypto/openssh/sshd_config.5 Fri Jun 28 09:55:00 2013 (r252339) +++ stable/8/crypto/openssh/sshd_config.5 Fri Jun 28 10:21:49 2013 (r252340) @@ -1095,7 +1095,7 @@ the privilege of the authenticated user. The goal of privilege separation is to prevent privilege escalation by containing any corruption within the unprivileged processes. The default is -.Dq sandbox . +.Dq yes . If .Cm UsePrivilegeSeparation is set to