svn commit: r203257 - projects/capabilities8/sys/sys

[Robert Watson]

Author: rwatson
Date: Sat Jan 30 21:09:07 2010
New Revision: 203257
URL: http://svn.freebsd.org/changeset/base/203257

Log:
  Merge c173953 from the p4 TrustedBSD Capabilities branch to capabilities8:
  
    Eliminate collision on capability sysctl flags due to new flags being
    added in SVN
  
  Sponsored by:	Google, Inc.

Modified:
  projects/capabilities8/sys/sys/sysctl.h

Modified: projects/capabilities8/sys/sys/sysctl.h
==============================================================================
--- projects/capabilities8/sys/sys/sysctl.h	Sat Jan 30 21:08:17 2010	(r203256)
+++ projects/capabilities8/sys/sys/sysctl.h	Sat Jan 30 21:09:07 2010	(r203257)
@@ -87,8 +87,8 @@ struct ctlname {
 #define CTLFLAG_MPSAFE	0x00040000	/* Handler is MP safe */
 #define CTLFLAG_VNET	0x00020000	/* Prisons with vnet can fiddle */
 #define CTLFLAG_RDTUN	(CTLFLAG_RD|CTLFLAG_TUN)
-#define CTLFLAG_CAPRD	0x00040000	/* Can be read in capability mode */
-#define CTLFLAG_CAPWR	0x00020000	/* Can be written in capability mode */
+#define CTLFLAG_CAPRD	0x00010000	/* Can be read in capability mode */
+#define CTLFLAG_CAPWR	0x00008000	/* Can be written in capability mode */
 #define CTLFLAG_CAPRW	(CTLFLAG_CAPRD|CTLFLAG_CAPWR)
 
 /*