From owner-svn-src-projects@FreeBSD.ORG Sat Jan 30 20:57:04 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 CE701106568B; Sat, 30 Jan 2010 20:57:04 +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 BF4E28FC12; Sat, 30 Jan 2010 20:57:04 +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 o0UKv4EA006362; Sat, 30 Jan 2010 20:57:04 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0UKv4X6006360; Sat, 30 Jan 2010 20:57:04 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201001302057.o0UKv4X6006360@svn.freebsd.org> From: Robert Watson Date: Sat, 30 Jan 2010 20:57:04 +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: r203253 - projects/capabilities8/usr.bin/gzip 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:57:04 -0000 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); }