diff options
| author | des <des@FreeBSD.org> | 2014-04-12 20:22:59 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2014-04-12 20:22:59 +0000 |
| commit | faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5 (patch) | |
| tree | 1869bb83deee7739b988ace790deca83cd513254 /crypto/openssh/sandbox-capsicum.c | |
| parent | 0918f176a2a27c20190030f7d90050e0b1a8e25c (diff) | |
| download | FreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.zip FreeBSD-src-faff1e38d22d47a8228fbfe7a7e7ae44391d4ca5.tar.gz | |
MFH (r263712): upgrade openssh to 6.6p1
MFH (r264308): restore p level in debugging output
Diffstat (limited to 'crypto/openssh/sandbox-capsicum.c')
| -rw-r--r-- | crypto/openssh/sandbox-capsicum.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssh/sandbox-capsicum.c b/crypto/openssh/sandbox-capsicum.c index 6064514..fd88de0 100644 --- a/crypto/openssh/sandbox-capsicum.c +++ b/crypto/openssh/sandbox-capsicum.c @@ -15,6 +15,7 @@ */ #include "includes.h" +__RCSID("$FreeBSD$"); #ifdef SANDBOX_CAPSICUM @@ -94,11 +95,11 @@ 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) |
