socsvn commit: r257184 - soc2013/dpl/head/contrib/bzip2

dpl at FreeBSD.org dpl at FreeBSD.org
Tue Sep 10 09:14:38 UTC 2013


Author: dpl
Date: Tue Sep 10 09:14:38 2013
New Revision: 257184
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257184

Log:
  Changed bzip2 to use cap_rights_init instead of cap_rights_init();; cap_rights_set();
  

Modified:
  soc2013/dpl/head/contrib/bzip2/bzip2.c

Modified: soc2013/dpl/head/contrib/bzip2/bzip2.c
==============================================================================
--- soc2013/dpl/head/contrib/bzip2/bzip2.c	Tue Sep 10 08:00:28 2013	(r257183)
+++ soc2013/dpl/head/contrib/bzip2/bzip2.c	Tue Sep 10 09:14:38 2013	(r257184)
@@ -671,14 +671,15 @@
    cap_rights_t rights;
 
    cap_rights_init(&rights);
+
    if (fd == OUT_FILENO)
-	  cap_rights_set(&rights, CAP_READ|CAP_FSTAT|CAP_WRITE|CAP_FCHMOD|CAP_FCHOWN|CAP_FUTIMES);
+      cap_rights_init(&rights, CAP_READ, CAP_FSTAT, CAP_WRITE, CAP_FCHMOD, CAP_FCHOWN, CAP_FUTIMES);
    else if (fd == IN_FILENO)
-	  cap_rights_set(&rights, CAP_WRITE|CAP_READ|CAP_FSTAT);
+      cap_rights_init(&rights, CAP_WRITE, CAP_READ, CAP_FSTAT);
    else if (fd == STDERR_FILENO)
-	  cap_rights_set(&rights, CAP_WRITE);
+      cap_rights_init(&rights, CAP_WRITE);
    else if (fd == cwd)
-	  cap_rights_set(&rights, CAP_UNLINKAT|CAP_LOOKUP);
+      cap_rights_init(&rights, CAP_UNLINKAT, CAP_LOOKUP);
    else {
       fprintf (stderr, "%s: Wrong file descriptor.\n", progName);
       setExit(1);


More information about the svn-soc-all mailing list