Merge 6.6p1.

* New upstream release (http://www.openssh.com/txt/release-6.6).

1 files changed, 4 insertions, 2 deletions

diff --git a/sandbox-capsicum.c b/sandbox-capsicum.c
index ee2a7e79e..655f0d217 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__);