PERFORCE change 100733 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=100733

Change 100733 by rwatson at rwatson_zoo on 2006/07/06 11:59:55

	Rename delete to unlink for vnodes, since that is what is being
	authorized.

Affected files ...

.. //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#7 edit
.. //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#15 edit

Differences ...

==== //depot/projects/trustedbsd/mac2/sys/sys/mac_framework.h#7 (text+ko) ====

@@ -337,8 +337,6 @@
 int	mac_vnode_check_chroot(struct ucred *cred, struct vnode *dvp);
 int	mac_vnode_check_create(struct ucred *cred, struct vnode *dvp,
 	    struct componentname *cnp, struct vattr *vap);
-int	mac_vnode_check_delete(struct ucred *cred, struct vnode *dvp,
-	    struct vnode *vp, struct componentname *cnp);
 int	mac_vnode_check_deleteacl(struct ucred *cred, struct vnode *vp,
 	    acl_type_t type);
 int	mac_vnode_check_deleteextattr(struct ucred *cred, struct vnode *vp,
@@ -386,6 +384,8 @@
 	    struct timespec atime, struct timespec mtime);
 int	mac_vnode_check_stat(struct ucred *active_cred,
 	    struct ucred *file_cred, struct vnode *vp);
+int	mac_vnode_check_unlink(struct ucred *cred, struct vnode *dvp,
+	    struct vnode *vp, struct componentname *cnp);
 int	mac_vnode_check_write(struct ucred *active_cred,
 	    struct ucred *file_cred, struct vnode *vp);
 

==== //depot/projects/trustedbsd/mac2/sys/sys/mac_policy.h#15 (text+ko) ====

@@ -581,9 +581,6 @@
 typedef int	(*mpo_vnode_check_create_t)(struct ucred *cred,
 		    struct vnode *dvp, struct label *dlabel,
 		    struct componentname *cnp, struct vattr *vap);
-typedef int	(*mpo_vnode_check_delete_t)(struct ucred *cred,
-		    struct vnode *dvp, struct label *dlabel,
-		    struct vnode *vp, struct label *label,
 		    struct componentname *cnp);
 typedef int	(*mpo_vnode_check_deleteacl_t)(struct ucred *cred,
 		    struct vnode *vp, struct label *label, acl_type_t type);
@@ -658,6 +655,9 @@
 typedef int	(*mpo_vnode_check_stat_t)(struct ucred *active_cred,
 		    struct ucred *file_cred, struct vnode *vp,
 		    struct label *label);
+typedef int	(*mpo_vnode_check_unlink_t)(struct ucred *cred,
+		    struct vnode *dvp, struct label *dlabel,
+		    struct vnode *vp, struct label *label,
 typedef int	(*mpo_vnode_check_write_t)(struct ucred *active_cred,
 		    struct ucred *file_cred, struct vnode *vp,
 		    struct label *label);
@@ -896,7 +896,6 @@
 	mpo_check_vnode_chdir_t			mpo_check_vnode_chdir;
 	mpo_check_vnode_chroot_t		mpo_check_vnode_chroot;
 	mpo_vnode_check_create_t		mpo_vnode_check_create;
-	mpo_vnode_check_delete_t		mpo_vnode_check_delete;
 	mpo_vnode_check_deleteacl_t		mpo_vnode_check_deleteacl;
 	mpo_vnode_check_deleteextattr_t		mpo_vnode_check_deleteextattr;
 	mpo_vnode_check_exec_t			mpo_vnode_check_exec;
@@ -924,6 +923,7 @@
 	mpo_vnode_check_setowner_t		mpo_vnode_check_setowner;
 	mpo_vnode_check_setutimes_t		mpo_vnode_check_setutimes;
 	mpo_vnode_check_stat_t			mpo_vnode_check_stat;
+	mpo_vnode_check_unlink_t		mpo_vnode_check_unlink;
 	mpo_vnode_check_write_t			mpo_vnode_check_write;
 };