PERFORCE change 19665 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=19665

Change 19665 by rwatson at rwatson_paprika on 2002/10/19 17:23:15

	If MAC_MAX_POLICIES isn't defined globally, we have big problems,
	so don't conditionally define it.
	
	Remove trailing whitespace.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#316 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#316 (text+ko) ====

@@ -101,12 +101,10 @@
 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,
@@ -3340,9 +3338,9 @@
 
 	if (!mac_enforce_socket)
 		return (0);
-                
+
 	MAC_CHECK(check_socket_visible, cred, socket, &socket->so_label);
-                            
+
 	return (error);
 }
 
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message