diff options
| author | rwatson <rwatson@FreeBSD.org> | 2007-09-10 00:00:18 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2007-09-10 00:00:18 +0000 |
| commit | 198c38400acd01acb916e7350ad6b0a60e56068e (patch) | |
| tree | 6d07b0ffd85b745bb08a976a4412f5862aba277b /sys/security/mac/mac_policy.h | |
| parent | 2f5eb093a49d608441a859f9e1771c6dbbc128e0 (diff) | |
| download | FreeBSD-src-198c38400acd01acb916e7350ad6b0a60e56068e.zip FreeBSD-src-198c38400acd01acb916e7350ad6b0a60e56068e.tar.gz | |
Rename mac_check_vnode_delete() MAC Framework and MAC Policy entry
point to mac_check_vnode_unlink(), reflecting UNIX naming conventions.
This is the first of several commits to synchronize the MAC Framework
in FreeBSD 7.0 with the MAC Framework as it will appear in Mac OS X
Leopard.
Reveiwed by: csjp, Samy Bahra <sbahra at gwu dot edu>
Submitted by: Jacques Vidrine <nectar at apple dot com>
Obtained from: Apple Computer, Inc.
Sponsored by: SPARTA, SPAWAR
Approved by: re (bmah)
Diffstat (limited to 'sys/security/mac/mac_policy.h')
| -rw-r--r-- | sys/security/mac/mac_policy.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h index bf9ad1a..dfcb987 100644 --- a/sys/security/mac/mac_policy.h +++ b/sys/security/mac/mac_policy.h @@ -524,10 +524,6 @@ typedef int (*mpo_check_vnode_chroot_t)(struct ucred *cred, typedef int (*mpo_check_vnode_create_t)(struct ucred *cred, struct vnode *dvp, struct label *dvplabel, struct componentname *cnp, struct vattr *vap); -typedef int (*mpo_check_vnode_delete_t)(struct ucred *cred, - struct vnode *dvp, struct label *dvplabel, - struct vnode *vp, struct label *vplabel, - struct componentname *cnp); typedef int (*mpo_check_vnode_deleteacl_t)(struct ucred *cred, struct vnode *vp, struct label *vplabel, acl_type_t type); @@ -604,6 +600,10 @@ typedef int (*mpo_check_vnode_setutimes_t)(struct ucred *cred, typedef int (*mpo_check_vnode_stat_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *vplabel); +typedef int (*mpo_check_vnode_unlink_t)(struct ucred *cred, + struct vnode *dvp, struct label *dvplabel, + struct vnode *vp, struct label *vplabel, + struct componentname *cnp); typedef int (*mpo_check_vnode_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *vplabel); @@ -868,7 +868,6 @@ struct mac_policy_ops { mpo_check_vnode_chdir_t mpo_check_vnode_chdir; mpo_check_vnode_chroot_t mpo_check_vnode_chroot; mpo_check_vnode_create_t mpo_check_vnode_create; - mpo_check_vnode_delete_t mpo_check_vnode_delete; mpo_check_vnode_deleteacl_t mpo_check_vnode_deleteacl; mpo_check_vnode_deleteextattr_t mpo_check_vnode_deleteextattr; mpo_check_vnode_exec_t mpo_check_vnode_exec; @@ -897,6 +896,7 @@ struct mac_policy_ops { mpo_check_vnode_setowner_t mpo_check_vnode_setowner; mpo_check_vnode_setutimes_t mpo_check_vnode_setutimes; mpo_check_vnode_stat_t mpo_check_vnode_stat; + mpo_check_vnode_unlink_t mpo_check_vnode_unlink; mpo_check_vnode_write_t mpo_check_vnode_write; mpo_associate_nfsd_label_t mpo_associate_nfsd_label; mpo_create_mbuf_from_firewall_t mpo_create_mbuf_from_firewall; |
