Date: Wed, 5 Mar 2014 14:13:47 -0500 From: John Baldwin <jhb@freebsd.org> To: Pawel Jakub Dawidek <pjd@freebsd.org> Cc: src-committers@freebsd.org, svn-src-stable-10@freebsd.org, svn-src-stable@freebsd.org, svn-src-all@freebsd.org, Dag-Erling =?iso-8859-15?q?Sm=F8rgrav?= <des@des.no>, Dimitry Andric <dimitry@andric.com> 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... Message-ID: <201403051413.48049.jhb@freebsd.org> In-Reply-To: <20140304194908.GA1672@garage.freebsd.pl> References: <201402271729.s1RHT2rx075258@svn.freebsd.org> <201403041146.57895.jhb@freebsd.org> <20140304194908.GA1672@garage.freebsd.pl>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tuesday, March 04, 2014 2:49:09 pm Pawel Jakub Dawidek wrote:
> On Tue, Mar 04, 2014 at 11:46:57AM -0500, John Baldwin wrote:
> > On Tuesday, March 04, 2014 3:40:47 am Dag-Erling Sm=F8rgrav 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 u=
se
> > > > > 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 alrea=
dy
> > > in head, but I'd forgotten that it had been committed separately.
>=20
> Xin already did it.
>=20
> > > BTW, IWBNI there were a cap_available() predicate or something like t=
hat
> > > which we could check up front, and short-circuit the entire Capsicum
> > > part of ssh_sandbox_child() if it failed.
> >=20
> > 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.
>=20
> It does add the following:
>=20
> FEATURE(security_capability_mode, "Capsicum Capability Mode");
> FEATURE(security_capabilities, "Capsicum Capabilities");
Ah, then 'feature_present("security_capabilities")' should suffice.
=2D-=20
John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403051413.48049.jhb>