From owner-svn-soc-all@FreeBSD.ORG  Tue Aug 20 14:48:40 2013
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id DAA39C16
 for <svn-soc-all@FreeBSD.org>; Tue, 20 Aug 2013 14:48:40 +0000 (UTC)
 (envelope-from dpl@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C7E6A2517
 for <svn-soc-all@FreeBSD.org>; Tue, 20 Aug 2013 14:48:40 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7KEmeDs010075
 for <svn-soc-all@FreeBSD.org>; Tue, 20 Aug 2013 14:48:40 GMT
 (envelope-from dpl@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r7KEmef8010065
 for svn-soc-all@FreeBSD.org; Tue, 20 Aug 2013 14:48:40 GMT
 (envelope-from dpl@FreeBSD.org)
Date: Tue, 20 Aug 2013 14:48:40 GMT
Message-Id: <201308201448.r7KEmef8010065@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 dpl@FreeBSD.org using -f
From: dpl@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r256202 - soc2013/dpl/head/contrib/xz/src/xz
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 20 Aug 2013 14:48:40 -0000

Author: dpl
Date: Tue Aug 20 14:48:40 2013
New Revision: 256202
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=256202

Log:
  Changed cap_init() for capsicum_enter(), since cap_init is a Casper public interface.
  

Modified:
  soc2013/dpl/head/contrib/xz/src/xz/file_io.c
  soc2013/dpl/head/contrib/xz/src/xz/file_io.h
  soc2013/dpl/head/contrib/xz/src/xz/main.c

Modified: soc2013/dpl/head/contrib/xz/src/xz/file_io.c
==============================================================================
--- soc2013/dpl/head/contrib/xz/src/xz/file_io.c	Tue Aug 20 14:26:23 2013	(r256201)
+++ soc2013/dpl/head/contrib/xz/src/xz/file_io.c	Tue Aug 20 14:48:40 2013	(r256202)
@@ -1053,7 +1053,7 @@
 }
 
 extern void
-cap_init(void)
+capsicum_enter(void)
 {
 	cap_rights_t rights;
 

Modified: soc2013/dpl/head/contrib/xz/src/xz/file_io.h
==============================================================================
--- soc2013/dpl/head/contrib/xz/src/xz/file_io.h	Tue Aug 20 14:26:23 2013	(r256201)
+++ soc2013/dpl/head/contrib/xz/src/xz/file_io.h	Tue Aug 20 14:48:40 2013	(r256202)
@@ -109,5 +109,5 @@
 extern void limitfd(file_pair *pair);
 
 /// \brief      Enters Capability mode, and limit basic fds.
-extern void cap_init(void);
+extern void capsicum_enter(void);
 #endif

Modified: soc2013/dpl/head/contrib/xz/src/xz/main.c
==============================================================================
--- soc2013/dpl/head/contrib/xz/src/xz/main.c	Tue Aug 20 14:26:23 2013	(r256201)
+++ soc2013/dpl/head/contrib/xz/src/xz/main.c	Tue Aug 20 14:48:40 2013	(r256202)
@@ -293,7 +293,7 @@
 			/* Let the children compress */
 			wait(NULL);
 		} else if (forkpid == 0){
-			cap_init();
+			capsicum_enter();
 #endif
 			run(pairs[i]);
 			free(files[i]);