socsvn commit: r256202 - soc2013/dpl/head/contrib/xz/src/xz

[dpl at FreeBSD.org]

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]);