diff options
author | rwatson <rwatson@FreeBSD.org> | 2006-08-06 16:56:15 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2006-08-06 16:56:15 +0000 |
commit | 2e4df4a14169b4f82bf28f061b02aa9688dfacea (patch) | |
tree | 169a9715fe520da41b04bd42b8784f8062c3dab4 | |
parent | a86a4a96029e89c0605789f238ffa7f6c897d7eb (diff) | |
download | FreeBSD-src-2e4df4a14169b4f82bf28f061b02aa9688dfacea.zip FreeBSD-src-2e4df4a14169b4f82bf28f061b02aa9688dfacea.tar.gz |
Make mpo_associate_nfsd_label() return void, not int, to match
mac_associate_nfsd_label().
Head nod: csjp
-rw-r--r-- | sys/security/mac/mac_policy.h | 2 | ||||
-rw-r--r-- | sys/security/mac_biba/mac_biba.c | 3 | ||||
-rw-r--r-- | sys/sys/mac_policy.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/sys/security/mac/mac_policy.h b/sys/security/mac/mac_policy.h index 11eb488..765d42e 100644 --- a/sys/security/mac/mac_policy.h +++ b/sys/security/mac/mac_policy.h @@ -589,7 +589,7 @@ typedef int (*mpo_check_vnode_stat_t)(struct ucred *active_cred, typedef int (*mpo_check_vnode_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); -typedef int (*mpo_associate_nfsd_label_t)(struct ucred *cred); +typedef void (*mpo_associate_nfsd_label_t)(struct ucred *cred); struct mac_policy_ops { /* diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index c098fe2..aecf72b 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -3019,7 +3019,7 @@ mac_biba_check_vnode_write(struct ucred *active_cred, return (0); } -static int +static void mac_biba_associate_nfsd_label(struct ucred *cred) { struct mac_biba *label; @@ -3028,7 +3028,6 @@ mac_biba_associate_nfsd_label(struct ucred *cred) mac_biba_set_effective(label, MAC_BIBA_TYPE_LOW, 0, NULL); mac_biba_set_range(label, MAC_BIBA_TYPE_LOW, 0, NULL, MAC_BIBA_TYPE_HIGH, 0, NULL); - return (0); } static struct mac_policy_ops mac_biba_ops = diff --git a/sys/sys/mac_policy.h b/sys/sys/mac_policy.h index 11eb488..765d42e 100644 --- a/sys/sys/mac_policy.h +++ b/sys/sys/mac_policy.h @@ -589,7 +589,7 @@ typedef int (*mpo_check_vnode_stat_t)(struct ucred *active_cred, typedef int (*mpo_check_vnode_write_t)(struct ucred *active_cred, struct ucred *file_cred, struct vnode *vp, struct label *label); -typedef int (*mpo_associate_nfsd_label_t)(struct ucred *cred); +typedef void (*mpo_associate_nfsd_label_t)(struct ucred *cred); struct mac_policy_ops { /* |