PERFORCE change 15002 for review

[Robert Watson]

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15002

Change 15002 by rwatson at rwatson_paprika on 2002/07/27 12:59:51

	Rename VALL to VALLPERM to match the central source tree
	version.

Affected files ...

.. //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#3 edit
.. //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#11 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#44 edit
.. //depot/projects/trustedbsd/mac/sys/sys/vnode.h#30 edit
.. //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#6 edit

Differences ...

==== //depot/projects/trustedbsd/mac/lib/libugidfw/ugidfw.c#3 (text+ko) ====

@@ -181,8 +181,8 @@
 	left -= len;
 	cur += len;
 
-	anymode = (rule->mbr_mode & VALL);
-	unknownmode = (rule->mbr_mode & ~VALL);
+	anymode = (rule->mbr_mode & VALLPERM);
+	unknownmode = (rule->mbr_mode & ~VALLPERM);
 
 	if (rule->mbr_mode & VADMIN) {
 		len = snprintf(cur, left, "a");

==== //depot/projects/trustedbsd/mac/sys/kern/kern_acl.c#11 (text+ko) ====

@@ -90,7 +90,7 @@
 	 */
 #ifndef CAPABILITIES
 	if (suser_cred(cred, PRISON_ROOT) == 0)
-		cap_granted = (VEXEC | VREAD | VWRITE | VADMIN | VAPPEND);
+		cap_granted = VALLPERM;
 	else
 		cap_granted = 0;
 #else

==== //depot/projects/trustedbsd/mac/sys/security/mac_bsdextended/mac_bsdextended.c#44 (text+ko) ====

@@ -109,7 +109,7 @@
 	if ((rule->mbr_object.mbi_flags | MBI_BITS) != MBI_BITS)
 		return (EINVAL);
 
-	if ((rule->mbr_mode | VALL) != VALL)
+	if ((rule->mbr_mode | VALLPERM) != VALLPERM)
 		return (EINVAL);
 
 	return (0);

==== //depot/projects/trustedbsd/mac/sys/sys/vnode.h#30 (text+ko) ====

@@ -248,7 +248,7 @@
 #define	VAPPEND	040000		/* permission to write/append */
 #define	VADMIN	010000		/* permission to administer vnode */
 #define	VSTAT	020000		/* permission to retrieve vnode attrs */
-#define	VALL	(VREAD | VWRITE | VEXEC | VAPPEND | VSTAT | VADMIN)
+#define	VALLPERM	(VREAD | VWRITE | VEXEC | VAPPEND | VSTAT | VADMIN)
 
 /*
  * Token indicating no attribute value yet assigned.

==== //depot/projects/trustedbsd/mac/usr.sbin/ugidfw/ugidfw.c#6 (text+ko) ====

@@ -118,8 +118,8 @@
 	}
 
 	printf("mode ");
-	anymode = (rule->mbr_mode & VALL);
-	unknownmode = (rule->mbr_mode & ~VALL);
+	anymode = (rule->mbr_mode & VALLPERM);
+	unknownmode = (rule->mbr_mode & ~VALLPERM);
 
 	if (rule->mbr_mode & VADMIN)
 		printf("a");
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message