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_test | |
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_test')
-rw-r--r-- | sys/security/mac_test/mac_test.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c index bbc3cf2..14b67b6 100644 --- a/sys/security/mac_test/mac_test.c +++ b/sys/security/mac_test/mac_test.c @@ -2098,21 +2098,6 @@ mac_test_check_vnode_create(struct ucred *cred, struct vnode *dvp, return (0); } -COUNTER_DECL(check_vnode_delete); -static int -mac_test_check_vnode_delete(struct ucred *cred, struct vnode *dvp, - struct label *dvplabel, struct vnode *vp, struct label *vplabel, - struct componentname *cnp) -{ - - LABEL_CHECK(cred->cr_label, MAGIC_CRED); - LABEL_CHECK(dvplabel, MAGIC_VNODE); - LABEL_CHECK(vplabel, MAGIC_VNODE); - COUNTER_INC(check_vnode_delete); - - return (0); -} - COUNTER_DECL(check_vnode_deleteacl); static int mac_test_check_vnode_deleteacl(struct ucred *cred, struct vnode *vp, @@ -2455,6 +2440,21 @@ mac_test_check_vnode_stat(struct ucred *active_cred, struct ucred *file_cred, return (0); } +COUNTER_DECL(check_vnode_unlink); +static int +mac_test_check_vnode_unlink(struct ucred *cred, struct vnode *dvp, + struct label *dvplabel, struct vnode *vp, struct label *vplabel, + struct componentname *cnp) +{ + + LABEL_CHECK(cred->cr_label, MAGIC_CRED); + LABEL_CHECK(dvplabel, MAGIC_VNODE); + LABEL_CHECK(vplabel, MAGIC_VNODE); + COUNTER_INC(check_vnode_unlink); + + return (0); +} + COUNTER_DECL(check_vnode_write); static int mac_test_check_vnode_write(struct ucred *active_cred, @@ -2656,7 +2656,6 @@ static struct mac_policy_ops mac_test_ops = .mpo_check_vnode_chdir = mac_test_check_vnode_chdir, .mpo_check_vnode_chroot = mac_test_check_vnode_chroot, .mpo_check_vnode_create = mac_test_check_vnode_create, - .mpo_check_vnode_delete = mac_test_check_vnode_delete, .mpo_check_vnode_deleteacl = mac_test_check_vnode_deleteacl, .mpo_check_vnode_deleteextattr = mac_test_check_vnode_deleteextattr, .mpo_check_vnode_exec = mac_test_check_vnode_exec, @@ -2682,6 +2681,7 @@ static struct mac_policy_ops mac_test_ops = .mpo_check_vnode_setowner = mac_test_check_vnode_setowner, .mpo_check_vnode_setutimes = mac_test_check_vnode_setutimes, .mpo_check_vnode_stat = mac_test_check_vnode_stat, + .mpo_check_vnode_unlink = mac_test_check_vnode_unlink, .mpo_check_vnode_write = mac_test_check_vnode_write, }; |