From dbdcb99498a0007fafce9b8f1b85de424b5d70d7 Mon Sep 17 00:00:00 2001 From: Robert Watson Date: Sat, 10 Jan 2009 09:17:16 +0000 Subject: [PATCH] Use MPC_OBJECT_IP6Q to indicate labeling of struct ip6q rather than MPC_OBJECT_IPQ; it was already defined, just not used. Obtained from: TrustedBSD Project Sponsored by: Apple, Inc. --- sys/security/mac/mac_inet6.c | 2 +- sys/security/mac_biba/mac_biba.c | 1 + sys/security/mac_lomac/mac_lomac.c | 1 + sys/security/mac_mls/mac_mls.c | 1 + sys/security/mac_stub/mac_stub.c | 1 + sys/security/mac_test/mac_test.c | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/security/mac/mac_inet6.c b/sys/security/mac/mac_inet6.c index 068455bf608..9201b36d229 100644 --- a/sys/security/mac/mac_inet6.c +++ b/sys/security/mac/mac_inet6.c @@ -80,7 +80,7 @@ int mac_ip6q_init(struct ip6q *q6, int flag) { - if (mac_labeled & MPC_OBJECT_IPQ) { + if (mac_labeled & MPC_OBJECT_IP6Q) { q6->ip6q_label = mac_ip6q_label_alloc(flag); if (q6->ip6q_label == NULL) return (ENOMEM); diff --git a/sys/security/mac_biba/mac_biba.c b/sys/security/mac_biba/mac_biba.c index 4e10f27f0cb..72a3f0ef5b6 100644 --- a/sys/security/mac_biba/mac_biba.c +++ b/sys/security/mac_biba/mac_biba.c @@ -3553,6 +3553,7 @@ static struct mac_policy_ops mac_biba_ops = MPC_OBJECT_DEVFS | \ MPC_OBJECT_MBUF | \ MPC_OBJECT_IPQ | \ + MPC_OBJECT_IP6Q | \ MPC_OBJECT_IFNET | \ MPC_OBJECT_BPFDESC | \ MPC_OBJECT_PIPE | \ diff --git a/sys/security/mac_lomac/mac_lomac.c b/sys/security/mac_lomac/mac_lomac.c index 9eb27019b3b..e2620cd4699 100644 --- a/sys/security/mac_lomac/mac_lomac.c +++ b/sys/security/mac_lomac/mac_lomac.c @@ -3060,6 +3060,7 @@ static struct mac_policy_ops lomac_ops = MPC_OBJECT_DEVFS | \ MPC_OBJECT_MBUF | \ MPC_OBJECT_IPQ | \ + MPC_OBJECT_IP6Q | \ MPC_OBJECT_IFNET | \ MPC_OBJECT_BPFDESC | \ MPC_OBJECT_PIPE | \ diff --git a/sys/security/mac_mls/mac_mls.c b/sys/security/mac_mls/mac_mls.c index 217fa5f44e4..abfad64a48f 100644 --- a/sys/security/mac_mls/mac_mls.c +++ b/sys/security/mac_mls/mac_mls.c @@ -3170,6 +3170,7 @@ static struct mac_policy_ops mls_ops = MPC_OBJECT_DEVFS | \ MPC_OBJECT_MBUF | \ MPC_OBJECT_IPQ | \ + MPC_OBJECT_IP6Q | \ MPC_OBJECT_IFNET | \ MPC_OBJECT_BPFDESC | \ MPC_OBJECT_PIPE | \ diff --git a/sys/security/mac_stub/mac_stub.c b/sys/security/mac_stub/mac_stub.c index 02cb541a48c..63de30f49cb 100644 --- a/sys/security/mac_stub/mac_stub.c +++ b/sys/security/mac_stub/mac_stub.c @@ -1808,6 +1808,7 @@ static struct mac_policy_ops stub_ops = MPC_OBJECT_DEVFS | \ MPC_OBJECT_MBUF | \ MPC_OBJECT_IPQ | \ + MPC_OBJECT_IP6Q | \ MPC_OBJECT_IFNET | \ MPC_OBJECT_BPFDESC | \ MPC_OBJECT_PIPE | \ diff --git a/sys/security/mac_test/mac_test.c b/sys/security/mac_test/mac_test.c index 08f8dd81428..9e8d54ebd8b 100644 --- a/sys/security/mac_test/mac_test.c +++ b/sys/security/mac_test/mac_test.c @@ -3147,6 +3147,7 @@ static struct mac_policy_ops test_ops = MPC_OBJECT_DEVFS | \ MPC_OBJECT_MBUF | \ MPC_OBJECT_IPQ | \ + MPC_OBJECT_IP6Q | \ MPC_OBJECT_IFNET | \ MPC_OBJECT_BPFDESC | \ MPC_OBJECT_PIPE | \