From owner-svn-src-stable@FreeBSD.ORG  Tue Mar  4 18:38:23 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D59A5524;
 Tue,  4 Mar 2014 18:38:23 +0000 (UTC)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
 (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id AA63D89D;
 Tue,  4 Mar 2014 18:38:23 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
 by bigwig.baldwin.cx (Postfix) with ESMTPSA id CBA00B982;
 Tue,  4 Mar 2014 13:38:21 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: "Dag-Erling =?utf-8?q?Sm=C3=B8rgrav?=" <des@des.no>
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...
Date: Tue, 4 Mar 2014 11:46:57 -0500
User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20130906; KDE/4.5.5; amd64; ; )
References: <201402271729.s1RHT2rx075258@svn.freebsd.org>
 <20140303233839.GD1659@garage.freebsd.pl> <86vbvutkz4.fsf@nine.des.no>
In-Reply-To: <86vbvutkz4.fsf@nine.des.no>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Message-Id: <201403041146.57895.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (bigwig.baldwin.cx); Tue, 04 Mar 2014 13:38:21 -0500 (EST)
Cc: src-committers@freebsd.org, Pawel Jakub Dawidek <pjd@freebsd.org>,
 svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable-10@freebsd.org, Dimitry Andric <dimitry@andric.com>
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
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Mar 2014 18:38:23 -0000

On Tuesday, March 04, 2014 3:40:47 am Dag-Erling Sm=C3=B8rgrav wrote:
> Pawel Jakub Dawidek <pjd@FreeBSD.org> writes:
> > Dimitry Andric <dimitry@andric.com> 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.
>=20
> 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.
>=20
> 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.

If the capsicum code adds a FEATURE(capsicum) macro in the kernel bits, you=
=20
can use 'if (feature_present("capsicum"))' in userland to check.

=2D-=20
John Baldwin