PERFORCE change 15612 for review

[Robert Watson]

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

Change 15612 by rwatson at rwatson_tislabs on 2002/08/06 07:56:11

	Sort vnode_mmap() and vnode_op() checks properly.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/sys/mac.h#142 edit
.. //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#107 edit

Differences ...

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


==== //depot/projects/trustedbsd/mac/sys/sys/mac_policy.h#107 (text+ko) ====

@@ -289,6 +289,10 @@
 	int	(*mpo_check_vnode_lookup)(struct ucred *cred,
 		    struct vnode *dvp, struct label *dlabel,
 		    struct componentname *cnp);
+	vm_prot_t	(*mpo_check_vnode_mmap_perms)(struct ucred *cred,
+		    struct vnode *vp, struct label *label, int newmapping);
+	int	(*mpo_check_vnode_op)(struct ucred *cred, struct vnode *vp,
+		    struct label *label, int op);
 	int	(*mpo_check_vnode_open)(struct ucred *cred, struct vnode *vp,
 		    struct label *label, mode_t acc_mode);
 	int	(*mpo_check_vnode_readdir)(struct ucred *cred,
@@ -325,10 +329,6 @@
 		    struct timespec atime, struct timespec mtime);
 	int	(*mpo_check_vnode_stat)(struct ucred *cred, struct vnode *vp,
 		    struct label *label);
-	vm_prot_t	(*mpo_check_vnode_mmap_perms)(struct ucred *cred,
-		    struct vnode *vp, struct label *label, int newmapping);
-	int	(*mpo_check_vnode_op)(struct ucred *cred, struct vnode *vp,
-		    struct label *label, int op);
 };
 
 typedef const void *macop_t;
@@ -431,7 +431,9 @@
 	MAC_CHECK_VNODE_GETACL,
 	MAC_CHECK_VNODE_GETEXTATTR,
 	MAC_CHECK_VNODE_LOOKUP,
+	MAC_CHECK_VNODE_OP,
 	MAC_CHECK_VNODE_OPEN,
+	MAC_CHECK_VNODE_MMAP_PERMS,
 	MAC_CHECK_VNODE_READDIR,
 	MAC_CHECK_VNODE_READLINK,
 	MAC_CHECK_VNODE_RELABEL,
@@ -445,8 +447,6 @@
 	MAC_CHECK_VNODE_SETOWNER,
 	MAC_CHECK_VNODE_SETUTIMES,
 	MAC_CHECK_VNODE_STAT,
-	MAC_CHECK_VNODE_MMAP_PERMS,
-	MAC_CHECK_VNODE_OP,
 };
 
 struct mac_policy_op_entry {
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message