svn commit: r187014 - in head/sys/security: mac mac_biba mac_lomac mac_mls mac_stub mac_test

[Robert Watson]

Author: rwatson
Date: Sat Jan 10 09:17:16 2009
New Revision: 187014
URL: http://svn.freebsd.org/changeset/base/187014

Log:
  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.

Modified:
  head/sys/security/mac/mac_inet6.c
  head/sys/security/mac_biba/mac_biba.c
  head/sys/security/mac_lomac/mac_lomac.c
  head/sys/security/mac_mls/mac_mls.c
  head/sys/security/mac_stub/mac_stub.c
  head/sys/security/mac_test/mac_test.c

Modified: head/sys/security/mac/mac_inet6.c
==============================================================================
--- head/sys/security/mac/mac_inet6.c	Sat Jan 10 06:55:37 2009	(r187013)
+++ head/sys/security/mac/mac_inet6.c	Sat Jan 10 09:17:16 2009	(r187014)
@@ -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);

Modified: head/sys/security/mac_biba/mac_biba.c
==============================================================================
--- head/sys/security/mac_biba/mac_biba.c	Sat Jan 10 06:55:37 2009	(r187013)
+++ head/sys/security/mac_biba/mac_biba.c	Sat Jan 10 09:17:16 2009	(r187014)
@@ -3553,6 +3553,7 @@ static struct mac_policy_ops mac_biba_op
 			 MPC_OBJECT_DEVFS |				\
 			 MPC_OBJECT_MBUF |				\
 			 MPC_OBJECT_IPQ |				\
+			 MPC_OBJECT_IP6Q |				\
 			 MPC_OBJECT_IFNET |				\
 			 MPC_OBJECT_BPFDESC |				\
 			 MPC_OBJECT_PIPE |				\

Modified: head/sys/security/mac_lomac/mac_lomac.c
==============================================================================
--- head/sys/security/mac_lomac/mac_lomac.c	Sat Jan 10 06:55:37 2009	(r187013)
+++ head/sys/security/mac_lomac/mac_lomac.c	Sat Jan 10 09:17:16 2009	(r187014)
@@ -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 |				\

Modified: head/sys/security/mac_mls/mac_mls.c
==============================================================================
--- head/sys/security/mac_mls/mac_mls.c	Sat Jan 10 06:55:37 2009	(r187013)
+++ head/sys/security/mac_mls/mac_mls.c	Sat Jan 10 09:17:16 2009	(r187014)
@@ -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 |				\

Modified: head/sys/security/mac_stub/mac_stub.c
==============================================================================
--- head/sys/security/mac_stub/mac_stub.c	Sat Jan 10 06:55:37 2009	(r187013)
+++ head/sys/security/mac_stub/mac_stub.c	Sat Jan 10 09:17:16 2009	(r187014)
@@ -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 |				\

Modified: head/sys/security/mac_test/mac_test.c
==============================================================================
--- head/sys/security/mac_test/mac_test.c	Sat Jan 10 06:55:37 2009	(r187013)
+++ head/sys/security/mac_test/mac_test.c	Sat Jan 10 09:17:16 2009	(r187014)
@@ -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 |				\