svn commit: r203245 - projects/capabilities8/lib/libcapsicum

[Robert Watson]

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 <jonathan.anderson at cl.cam.ac.uk>

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 <sys/param.h>
@@ -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,