Date: Tue, 4 Mar 2014 11:46:57 -0500 From: John Baldwin <jhb@freebsd.org> To: "Dag-Erling =?utf-8?q?Sm=C3=B8rgrav?=" <des@des.no> 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> 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: <201403041146.57895.jhb@freebsd.org> In-Reply-To: <86vbvutkz4.fsf@nine.des.no> References: <201402271729.s1RHT2rx075258@svn.freebsd.org> <20140303233839.GD1659@garage.freebsd.pl> <86vbvutkz4.fsf@nine.des.no>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tuesday, March 04, 2014 3:40:47 am Dag-Erling Smørgrav 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.
>
> 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.
If the capsicum code adds a FEATURE(capsicum) macro in the kernel bits, you
can use 'if (feature_present("capsicum"))' in userland to check.
--
John Baldwin
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403041146.57895.jhb>