From owner-svn-src-projects@FreeBSD.ORG  Sun May 30 22:53:49 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
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 431971065670;
	Sun, 30 May 2010 22:53:49 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 324908FC13;
	Sun, 30 May 2010 22:53:49 +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 o4UMrn74079908;
	Sun, 30 May 2010 22:53:49 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4UMrnVA079906;
	Sun, 30 May 2010 22:53:49 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201005302253.o4UMrnVA079906@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sun, 30 May 2010 22:53:49 +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: r208661 - 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 &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 May 2010 22:53:49 -0000

Author: rwatson
Date: Sun May 30 22:53:48 2010
New Revision: 208661
URL: http://svn.freebsd.org/changeset/base/208661

Log:
  Merge 174292 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Removed lch_start_libs and lch_startfd_libs, which have no more
    implementation.
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/lib/libcapsicum/libcapsicum.h

Modified: projects/capabilities8/lib/libcapsicum/libcapsicum.h
==============================================================================
--- projects/capabilities8/lib/libcapsicum/libcapsicum.h	Sun May 30 22:14:52 2010	(r208660)
+++ projects/capabilities8/lib/libcapsicum/libcapsicum.h	Sun May 30 22:53:48 2010	(r208661)
@@ -131,13 +131,8 @@ int	lch_autosandbox_isenabled(const char
  */
 int	lch_start(const char *sandbox, char *const argv[], u_int flags,
 	    struct lc_fdlist *fds, struct lc_sandbox **lcspp);
-int	lch_start_libs(const char *sandbox, char *const argv[], u_int flags,
-	    struct lc_fdlist *fds, struct lc_sandbox **lcspp);
 int	lch_startfd(int fd_sandbox, const char *binname, char *const argv[],
 	    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_fdlist *fds,
-	    struct lc_sandbox **lcspp);
 void	lch_stop(struct lc_sandbox *lcsp);
 
 /*