If MAC_MAX_POLICIES isn't defined, don't try to define it, just let the

compile fail.  MAC_MAX_POLICIES should always be defined, or we have
bigger problems at hand.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, Network Associates Laboratories

9 files changed, 9 insertions, 27 deletions

diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c
index 88e9636..556d1ff 100644
--- a/sys/kern/kern_mac.c
+++ b/sys/kern/kern_mac.c
@@ -99,12 +99,10 @@ SYSCTL_DECL(_security);
 SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0,
     "TrustedBSD MAC policy controls");
 
-#ifndef MAC_MAX_POLICIES
-#define	MAC_MAX_POLICIES	8
-#endif
 #if MAC_MAX_POLICIES > 32
 #error "MAC_MAX_POLICIES too large"
 #endif
+
 static unsigned int mac_max_policies = MAC_MAX_POLICIES;
 static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1;
 SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD,
diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c
index 88e9636..556d1ff 100644
--- a/sys/security/mac/mac_framework.c
+++ b/sys/security/mac/mac_framework.c
@@ -99,12 +99,10 @@ SYSCTL_DECL(_security);
 SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0,
     "TrustedBSD MAC policy controls");
 
-#ifndef MAC_MAX_POLICIES
-#define	MAC_MAX_POLICIES	8
-#endif
 #if MAC_MAX_POLICIES > 32
 #error "MAC_MAX_POLICIES too large"
 #endif
+
 static unsigned int mac_max_policies = MAC_MAX_POLICIES;
 static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1;
 SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD,
diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h
index 88e9636..556d1ff 100644
--- a/sys/security/mac/mac_internal.h
+++ b/sys/security/mac/mac_internal.h
@@ -99,12 +99,10 @@ SYSCTL_DECL(_security);
 SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0,
     "TrustedBSD MAC policy controls");
 
-#ifndef MAC_MAX_POLICIES
-#define	MAC_MAX_POLICIES	8
-#endif
 #if MAC_MAX_POLICIES > 32
 #error "MAC_MAX_POLICIES too large"
 #endif
+
 static unsigned int mac_max_policies = MAC_MAX_POLICIES;
 static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1;
 SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD,
diff --git a/sys/security/mac/mac_net.c b/sys/security/mac/mac_net.c
index 88e9636..556d1ff 100644
--- a/sys/security/mac/mac_net.c
+++ b/sys/security/mac/mac_net.c
@@ -99,12 +99,10 @@ SYSCTL_DECL(_security);
 SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0,
     "TrustedBSD MAC policy controls");
 
-#ifndef MAC_MAX_POLICIES
-#define	MAC_MAX_POLICIES	8
-#endif
 #if MAC_MAX_POLICIES > 32
 #error "MAC_MAX_POLICIES too large"
 #endif
+
 static unsigned int mac_max_policies = MAC_MAX_POLICIES;
 static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1;
 SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD,
diff --git a/sys/security/mac/mac_pipe.c b/sys/security/mac/mac_pipe.c
index 88e9636..556d1ff 100644
--- a/sys/security/mac/mac_pipe.c
+++ b/sys/security/mac/mac_pipe.c
@@ -99,12 +99,10 @@ SYSCTL_DECL(_security);
 SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0,
     "TrustedBSD MAC policy controls");
 
-#ifndef MAC_MAX_POLICIES
-#define	MAC_MAX_POLICIES	8
-#endif
 #if MAC_MAX_POLICIES > 32
 #error "MAC_MAX_POLICIES too large"
 #endif
+
 static unsigned int mac_max_policies = MAC_MAX_POLICIES;
 static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1;
 SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD,
diff --git a/sys/security/mac/mac_process.c b/sys/security/mac/mac_process.c
index 88e9636..556d1ff 100644
--- a/sys/security/mac/mac_process.c
+++ b/sys/security/mac/mac_process.c
@@ -99,12 +99,10 @@ SYSCTL_DECL(_security);
 SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0,
     "TrustedBSD MAC policy controls");
 
-#ifndef MAC_MAX_POLICIES
-#define	MAC_MAX_POLICIES	8
-#endif
 #if MAC_MAX_POLICIES > 32
 #error "MAC_MAX_POLICIES too large"
 #endif
+
 static unsigned int mac_max_policies = MAC_MAX_POLICIES;
 static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1;
 SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD,
diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c
index 88e9636..556d1ff 100644
--- a/sys/security/mac/mac_syscalls.c
+++ b/sys/security/mac/mac_syscalls.c
@@ -99,12 +99,10 @@ SYSCTL_DECL(_security);
 SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0,
     "TrustedBSD MAC policy controls");
 
-#ifndef MAC_MAX_POLICIES
-#define	MAC_MAX_POLICIES	8
-#endif
 #if MAC_MAX_POLICIES > 32
 #error "MAC_MAX_POLICIES too large"
 #endif
+
 static unsigned int mac_max_policies = MAC_MAX_POLICIES;
 static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1;
 SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD,
diff --git a/sys/security/mac/mac_system.c b/sys/security/mac/mac_system.c
index 88e9636..556d1ff 100644
--- a/sys/security/mac/mac_system.c
+++ b/sys/security/mac/mac_system.c
@@ -99,12 +99,10 @@ SYSCTL_DECL(_security);
 SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0,
     "TrustedBSD MAC policy controls");
 
-#ifndef MAC_MAX_POLICIES
-#define	MAC_MAX_POLICIES	8
-#endif
 #if MAC_MAX_POLICIES > 32
 #error "MAC_MAX_POLICIES too large"
 #endif
+
 static unsigned int mac_max_policies = MAC_MAX_POLICIES;
 static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1;
 SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD,
diff --git a/sys/security/mac/mac_vfs.c b/sys/security/mac/mac_vfs.c
index 88e9636..556d1ff 100644
--- a/sys/security/mac/mac_vfs.c
+++ b/sys/security/mac/mac_vfs.c
@@ -99,12 +99,10 @@ SYSCTL_DECL(_security);
 SYSCTL_NODE(_security, OID_AUTO, mac, CTLFLAG_RW, 0,
     "TrustedBSD MAC policy controls");
 
-#ifndef MAC_MAX_POLICIES
-#define	MAC_MAX_POLICIES	8
-#endif
 #if MAC_MAX_POLICIES > 32
 #error "MAC_MAX_POLICIES too large"
 #endif
+
 static unsigned int mac_max_policies = MAC_MAX_POLICIES;
 static unsigned int mac_policy_offsets_free = (1 << MAC_MAX_POLICIES) - 1;
 SYSCTL_UINT(_security_mac, OID_AUTO, max_policies, CTLFLAG_RD,