svn commit: r203253 - projects/capabilities8/usr.bin/gzip

[Robert Watson]

Author: rwatson
Date: Sat Jan 30 20:57:04 2010
New Revision: 203253
URL: http://svn.freebsd.org/changeset/base/203253

Log:
  Merge c173946 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    libcapsicum now expects an (optional) fdlist when creating a sandbox,
    so update gzip.
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/usr.bin/gzip/gzsandbox.c

Modified: projects/capabilities8/usr.bin/gzip/gzsandbox.c
==============================================================================
--- projects/capabilities8/usr.bin/gzip/gzsandbox.c	Sat Jan 30 20:56:04 2010	(r203252)
+++ projects/capabilities8/usr.bin/gzip/gzsandbox.c	Sat Jan 30 20:57:04 2010	(r203253)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2009 Robert N. M. Watson
+ * Copyright (c) 2009-2010 Robert N. M. Watson
  * All rights reserved.
  *
  * WARNING: THIS IS EXPERIMENTAL SECURITY SOFTWARE THAT MUST NOT BE RELIED
@@ -104,8 +104,8 @@ gzsandbox_initialize(void)
 			err(-1, "open: %s", gzsandbox_libs[i].lcl_libname);
 	}
 	if (lch_start_libs(LC_USR_BIN_GZIP_SANDBOX, lc_sandbox_argv,
-	    LCH_PERMIT_STDERR, gzsandbox_libs, gzsandbox_libs_count, &lcsp)
-	    < 0)
+	    LCH_PERMIT_STDERR, gzsandbox_libs, gzsandbox_libs_count, NULL,
+	    &lcsp) < 0)
 		err(-1, "lch_start %s", LC_USR_BIN_GZIP_SANDBOX);
 }