From owner-svn-src-all@FreeBSD.ORG  Mon Mar  3 23:19:29 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 44F99DC4;
 Mon,  3 Mar 2014 23:19:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3194DDAD;
 Mon,  3 Mar 2014 23:19:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s23NJTUX072529;
 Mon, 3 Mar 2014 23:19:29 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s23NJTBN072528;
 Mon, 3 Mar 2014 23:19:29 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201403032319.s23NJTBN072528@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 3 Mar 2014 23:19:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r262718 - stable/10/crypto/openssh
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Mar 2014 23:19:29 -0000

Author: delphij
Date: Mon Mar  3 23:19:28 2014
New Revision: 262718
URL: http://svnweb.freebsd.org/changeset/base/262718

Log:
  MFC r261499 (pjd):
  
  Fix installations that use kernels without CAPABILITIES support.

Modified:
  stable/10/crypto/openssh/sandbox-capsicum.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/crypto/openssh/sandbox-capsicum.c
==============================================================================
--- stable/10/crypto/openssh/sandbox-capsicum.c	Mon Mar  3 20:28:27 2014	(r262717)
+++ stable/10/crypto/openssh/sandbox-capsicum.c	Mon Mar  3 23:19:28 2014	(r262718)
@@ -94,10 +94,12 @@ ssh_sandbox_child(struct ssh_sandbox *bo
 		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) == -1 &&
+	    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) == -1 &&
+	    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__);