summaryrefslogtreecommitdiffstats
path: root/sys/security/mac_mls
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2003-12-06 21:48:03 +0000
committerrwatson <rwatson@FreeBSD.org>2003-12-06 21:48:03 +0000
commit08335c63bf85bb1d25ca094ab55a04b390c0acda (patch)
tree80bf1fc6acf72a565465aa4b66b0dba3b2b80af2 /sys/security/mac_mls
parent55ee8acb7fba4f6a262ab48a2a5ed1753cc12dcc (diff)
downloadFreeBSD-src-08335c63bf85bb1d25ca094ab55a04b390c0acda.zip
FreeBSD-src-08335c63bf85bb1d25ca094ab55a04b390c0acda.tar.gz
Rename mac_create_cred() MAC Framework entry point to mac_copy_cred(),
and the mpo_create_cred() MAC policy entry point to mpo_copy_cred_label(). This is more consistent with similar entry points for creation and label copying, as mac_create_cred() was called from crdup() as opposed to during process creation. For a number of policies, this removes the requirement for special handling when copying credential labels, and improves consistency. Approved by: re (scottl) Obtained from: TrustedBSD Project Sponsored by: DARPA, Network Associates Laboratories
Diffstat (limited to 'sys/security/mac_mls')
-rw-r--r--sys/security/mac_mls/mac_mls.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c
index e3c2ef4..3a73467 100644
--- a/sys/security/mac_mls/mac_mls.c
+++ b/sys/security/mac_mls/mac_mls.c
@@ -1258,18 +1258,6 @@ mac_mls_inpcb_sosetlabel(struct socket *so, struct label *solabel,
* Labeling event operations: processes.
*/
static void
-mac_mls_create_cred(struct ucred *cred_parent, struct ucred *cred_child)
-{
- struct mac_mls *source, *dest;
-
- source = SLOT(cred_parent->cr_label);
- dest = SLOT(cred_child->cr_label);
-
- mac_mls_copy_single(source, dest);
- mac_mls_copy_range(source, dest);
-}
-
-static void
mac_mls_create_proc0(struct ucred *cred)
{
struct mac_mls *dest;
@@ -2440,6 +2428,7 @@ static struct mac_policy_ops mac_mls_ops =
.mpo_destroy_socket_label = mac_mls_destroy_label,
.mpo_destroy_socket_peer_label = mac_mls_destroy_label,
.mpo_destroy_vnode_label = mac_mls_destroy_label,
+ .mpo_copy_cred_label = mac_mls_copy_label,
.mpo_copy_mbuf_label = mac_mls_copy_label,
.mpo_copy_pipe_label = mac_mls_copy_label,
.mpo_copy_socket_label = mac_mls_copy_label,
@@ -2491,7 +2480,6 @@ static struct mac_policy_ops mac_mls_ops =
.mpo_relabel_ifnet = mac_mls_relabel_ifnet,
.mpo_update_ipq = mac_mls_update_ipq,
.mpo_inpcb_sosetlabel = mac_mls_inpcb_sosetlabel,
- .mpo_create_cred = mac_mls_create_cred,
.mpo_create_proc0 = mac_mls_create_proc0,
.mpo_create_proc1 = mac_mls_create_proc1,
.mpo_relabel_cred = mac_mls_relabel_cred,
OpenPOWER on IntegriCloud