PERFORCE change 15132 for review

[Robert Watson]

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

Change 15132 by rwatson at rwatson_paprika on 2002/07/29 10:04:00

	A bit more sorting.  The entry points were really unsorted before.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/sys/mac.h#137 edit

Differences ...

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

@@ -339,6 +339,8 @@
 int	mac_check_vnode_chroot(struct ucred *cred, struct vnode *dvp);
 int	mac_check_vnode_create(struct ucred *cred, struct vnode *dvp,
 	    struct componentname *cnp, struct vattr *vap);
+int	mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp,
+	    struct vnode *vp, struct componentname *cnp);
 int	mac_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp,
 	    acl_type_t type);
 int	mac_check_vnode_exec(struct ucred *cred, struct vnode *vp);
@@ -348,6 +350,19 @@
 	    int attrnamespace, const char *name, struct uio *uio);
 int	mac_check_vnode_lookup(struct ucred *cred, struct vnode *dvp,
  	    struct componentname *cnp);
+/* XXX This u_char should be vm_prot_t! */
+u_char	mac_check_vnode_mmap_prot(struct ucred *cred, struct vnode *vp,
+	    int newmapping);
+int	mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op);
+int	mac_check_vnode_open(struct ucred *cred, struct vnode *vp,
+	    mode_t acc_mode);
+int	mac_check_vnode_readdir(struct ucred *cred, struct vnode *vp);
+int	mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp);
+int	mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp,
+	    struct vnode *vp, struct componentname *cnp);
+int	mac_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp,
+	    struct vnode *vp, int samedir, struct componentname *cnp);
+int	mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp);
 int	mac_check_vnode_setacl(struct ucred *cred, struct vnode *vp,
 	    acl_type_t type, struct acl *acl);
 int	mac_check_vnode_setextattr(struct ucred *cred, struct vnode *vp,
@@ -361,21 +376,6 @@
 int	mac_check_vnode_setutimes(struct ucred *cred, struct vnode *vp,
 	    struct timespec atime, struct timespec mtime);
 int	mac_check_vnode_stat(struct ucred *cred, struct vnode *vp);
-int	mac_check_vnode_delete(struct ucred *cred, struct vnode *dvp,
-	    struct vnode *vp, struct componentname *cnp);
-int	mac_check_vnode_rename_from(struct ucred *cred, struct vnode *dvp,
-	    struct vnode *vp, struct componentname *cnp);
-int	mac_check_vnode_rename_to(struct ucred *cred, struct vnode *dvp,
-	    struct vnode *vp, int samedir, struct componentname *cnp);
-/* XXX This u_char should be vm_prot_t! */
-u_char	mac_check_vnode_mmap_prot(struct ucred *cred, struct vnode *vp,
-	    int newmapping);
-int	mac_check_vnode_open(struct ucred *cred, struct vnode *vp,
-	    mode_t acc_mode);
-int	mac_check_vnode_readdir(struct ucred *cred, struct vnode *vp);
-int	mac_check_vnode_readlink(struct ucred *cred, struct vnode *vp);
-int	mac_check_vnode_revoke(struct ucred *cred, struct vnode *vp);
-int	mac_check_vnode_op(struct ucred *cred, struct vnode *vp, int op);
 int	mac_getsockopt_label_get(struct ucred *cred, struct socket *so,
 	    struct mac *extmac);
 int	mac_getsockopt_peerlabel_get(struct ucred *cred, struct socket *so,
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message