On Tuesday, March 04, 2014 3:40:47 am Dag-Erling Smørgrav wrote: > Pawel Jakub Dawidek <p...@freebsd.org> writes: > > Dimitry Andric <dimi...@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 _______________________________________________ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"