From owner-svn-src-stable@FreeBSD.ORG Tue Mar 4 08:40:43 2014 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E2CFE64A; Tue, 4 Mar 2014 08:40:43 +0000 (UTC) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 9C6EB276; Tue, 4 Mar 2014 08:40:43 +0000 (UTC) Received: from nine.des.no (smtp.des.no [194.63.250.102]) by smtp-int.des.no (Postfix) with ESMTP id CA1F05ABB; Tue, 4 Mar 2014 08:40:42 +0000 (UTC) Received: by nine.des.no (Postfix, from userid 1001) id 1784F827; Tue, 4 Mar 2014 09:40:47 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Pawel Jakub Dawidek Subject: Re: svn commit: r262566 - in stable/10: crypto/openssh crypto/openssh/contrib/caldera crypto/openssh/contrib/cygwin crypto/openssh/contrib/redhat crypto/openssh/contrib/suse crypto/openssh/openbsd-comp... References: <201402271729.s1RHT2rx075258@svn.freebsd.org> <201403031536.33679.jhb@freebsd.org> <20140303233839.GD1659@garage.freebsd.pl> Date: Tue, 04 Mar 2014 09:40:47 +0100 In-Reply-To: <20140303233839.GD1659@garage.freebsd.pl> (Pawel Jakub Dawidek's message of "Tue, 4 Mar 2014 00:38:39 +0100") Message-ID: <86vbvutkz4.fsf@nine.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: src-committers@freebsd.org, svn-src-stable-10@freebsd.org, John Baldwin , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, Dimitry Andric X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Mar 2014 08:40:44 -0000 Pawel Jakub Dawidek writes: > Dimitry Andric writes: > > Wouldn't it be enough to merge r261499 ("Fix installations that use > > kernels without CAPABILITIES support") by pjd? > Yes, my change should be definiately merged with OpenSSH merge. If > nobody beats me to it, I should be able to merge it tomorrow. Please do. I thought I had included it in the MFC since it was already in head, but I'd forgotten that it had been committed separately. BTW, IWBNI there were a cap_available() predicate or something like that which we could check up front, and short-circuit the entire Capsicum part of ssh_sandbox_child() if it failed. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no