PERFORCE change 19815 for review

[Robert Watson]

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

Change 19815 by rwatson at rwatson_paprika on 2002/10/21 11:15:28

	Spelling consistency for variables of similar nature between
	modules.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#126 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac_mls/mac_mls.c#126 (text+ko) ====

@@ -97,11 +97,10 @@
     &ptys_equal, 0, "Label pty devices as mls/equal on create");
 TUNABLE_INT("security.mac.mls.ptys_equal", &ptys_equal);
 
-static int	mac_mls_revocation_enabled = 0;
+static int	revocation_enabled = 0;
 SYSCTL_INT(_security_mac_mls, OID_AUTO, revocation_enabled, CTLFLAG_RW,
-    &mac_mls_revocation_enabled, 0, "Revoke access to objects on relabel");
-TUNABLE_INT("security.mac.mls.revocation_enabled",
-    &mac_mls_revocation_enabled);
+    &revocation_enabled, 0, "Revoke access to objects on relabel");
+TUNABLE_INT("security.mac.mls.revocation_enabled", &revocation_enabled);
 
 static int	mac_mls_max_compartments = MAC_MLS_MAX_COMPARTMENTS;
 SYSCTL_INT(_security_mac_mls, OID_AUTO, max_compartments, CTLFLAG_RD,
@@ -1956,7 +1955,7 @@
 	 * Rely on the use of open()-time protections to handle
 	 * non-revocation cases.
 	 */
-	if (!mac_mls_enabled || !mac_mls_revocation_enabled)
+	if (!mac_mls_enabled || !revocation_enabled)
 		return (0);
 
 	subj = SLOT(&cred->cr_label);
@@ -2005,7 +2004,7 @@
 {
 	struct mac_mls *subj, *obj;
 
-	if (!mac_mls_enabled || !mac_mls_revocation_enabled)
+	if (!mac_mls_enabled || !revocation_enabled)
 		return (0);
 
 	subj = SLOT(&active_cred->cr_label);
@@ -2023,7 +2022,7 @@
 {
 	struct mac_mls *subj, *obj;
 
-	if (!mac_mls_enabled || !mac_mls_revocation_enabled)
+	if (!mac_mls_enabled || !revocation_enabled)
 		return (0);
 
 	subj = SLOT(&active_cred->cr_label);
@@ -2326,7 +2325,7 @@
 {
 	struct mac_mls *subj, *obj;
 
-	if (!mac_mls_enabled || !mac_mls_revocation_enabled)
+	if (!mac_mls_enabled || !revocation_enabled)
 		return (0);
 
 	subj = SLOT(&active_cred->cr_label);
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message