diff options
| author | djm <djm> | 2014-02-04 23:33:45 +0000 |
|---|---|---|
| committer | djm <djm> | 2014-02-04 23:33:45 +0000 |
| commit | c11de66d4665c68922e4c3bcee743d1a503fb28b (patch) | |
| tree | 4aba1194a8848e90b51f892014bbbf439c134a53 | |
| parent | d263717f4d8e1eb251dbca8b6621d25aa53d2f16 (diff) | |
| download | openssh-c11de66d4665c68922e4c3bcee743d1a503fb28b.tar.gz | |
- (djm) [sandbox-capsicum.c] Don't fatal if Capsicum is offered by
headers/libc but not supported by the kernel. Patch from Loganaden
Velvindron @ AfriNIC
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sandbox-capsicum.c | 6 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +20140205 + - (djm) [sandbox-capsicum.c] Don't fatal if Capsicum is offered by + headers/libc but not supported by the kernel. Patch from Loganaden + Velvindron @ AfriNIC + 20140204 - OpenBSD CVS Sync - markus@cvs.openbsd.org 2014/01/27 18:58:14 diff --git a/sandbox-capsicum.c b/sandbox-capsicum.c index ee2a7e79..655f0d21 100644 --- a/sandbox-capsicum.c +++ b/sandbox-capsicum.c @@ -94,10 +94,12 @@ ssh_sandbox_child(struct ssh_sandbox *box) fatal("can't limit stderr: %m"); cap_rights_init(&rights, CAP_READ, CAP_WRITE); - if (cap_rights_limit(box->monitor->m_recvfd, &rights) == -1) + if (cap_rights_limit(box->monitor->m_recvfd, &rights) < 0 && + errno != ENOSYS) fatal("%s: failed to limit the network socket", __func__); cap_rights_init(&rights, CAP_WRITE); - if (cap_rights_limit(box->monitor->m_log_sendfd, &rights) == -1) + if (cap_rights_limit(box->monitor->m_log_sendfd, &rights) < 0 && + errno != ENOSYS) fatal("%s: failed to limit the logging socket", __func__); if (cap_enter() < 0 && errno != ENOSYS) fatal("%s: failed to enter capability mode", __func__); |