From owner-svn-src-projects@FreeBSD.ORG Sat Jan 30 20:32:23 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D2EC51065696; Sat, 30 Jan 2010 20:32:23 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id AA4528FC1B; Sat, 30 Jan 2010 20:32:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o0UKWNS5000629; Sat, 30 Jan 2010 20:32:23 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UKWNPG000626; Sat, 30 Jan 2010 20:32:23 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201001302032.o0UKWNPG000626@svn.freebsd.org> From: Robert Watson Date: Sat, 30 Jan 2010 20:32:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r203245 - projects/capabilities8/lib/libcapsicum X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jan 2010 20:32:23 -0000 Author: rwatson Date: Sat Jan 30 20:32:23 2010 New Revision: 203245 URL: http://svn.freebsd.org/changeset/base/203245 Log: Merge c173855 from the p4 TrustedBSD Capabilities branch to capabilities8: Changed the libcapsicum startfd API to accept an lc_fdlist (no implementation changes yet) Submitted by: Jonathan Anderson Modified: projects/capabilities8/lib/libcapsicum/libcapsicum.h projects/capabilities8/lib/libcapsicum/libcapsicum_host.c Modified: projects/capabilities8/lib/libcapsicum/libcapsicum.h ============================================================================== --- projects/capabilities8/lib/libcapsicum/libcapsicum.h Sat Jan 30 20:29:50 2010 (r203244) +++ projects/capabilities8/lib/libcapsicum/libcapsicum.h Sat Jan 30 20:32:23 2010 (r203245) @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#1 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum.h#2 $ */ #ifndef _LIBCAPABILITY_H_ @@ -121,7 +121,7 @@ int lch_start_libs(const char *sandbox, struct lc_library *lclp, u_int lcl_count, struct lc_sandbox **lcspp); int lch_startfd(int fd_sandbox, const char *binname, char *const argv[], - u_int flags, struct lc_sandbox **lcspp); + u_int flags, struct lc_fdlist *fds, struct lc_sandbox **lcspp); int lch_startfd_libs(int fd_sandbox, const char *binname, char *const argv[], u_int flags, struct lc_library *lclp, u_int lcl_count, struct lc_sandbox **lcspp); Modified: projects/capabilities8/lib/libcapsicum/libcapsicum_host.c ============================================================================== --- projects/capabilities8/lib/libcapsicum/libcapsicum_host.c Sat Jan 30 20:29:50 2010 (r203244) +++ projects/capabilities8/lib/libcapsicum/libcapsicum_host.c Sat Jan 30 20:32:23 2010 (r203245) @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#1 $ + * $P4: //depot/projects/trustedbsd/capabilities/src/lib/libcapsicum/libcapsicum_host.c#2 $ */ #include @@ -349,7 +349,7 @@ out_error: int lch_startfd(int fd_sandbox, const char *binname, char *const argv[], - u_int flags, struct lc_sandbox **lcspp) + u_int flags, __unused struct lc_fdlist *fds, struct lc_sandbox **lcspp) { return (lch_startfd_libs(fd_sandbox, binname, argv, flags, NULL, 0,