PERFORCE change 20130 for review

[Robert Watson]

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

Change 20130 by rwatson at rwatson_tislabs on 2002/10/25 09:52:42

	For consistency, name mac_biba_privileged as
	mac_biba_subject_privileged -- it should only be called on subjects.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#160 edit

Differences ...

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

@@ -312,12 +312,12 @@
 }
 
 static int
-mac_biba_privileged(struct mac_biba *mac_biba)
+mac_biba_subject_privileged(struct mac_biba *mac_biba)
 {
 
 	KASSERT((mac_biba->mb_flags & MAC_BIBA_FLAGS_BOTH) ==
 	    MAC_BIBA_FLAGS_BOTH,
-	    ("mac_biba_subject_equal_ok: subject doesn't have both labels"));
+	    ("mac_biba_subject_privileged: subject doesn't have both labels"));
 
 	/* If the single is EQUAL, it's ok. */
 	if (mac_biba->mb_single.mbe_type == MAC_BIBA_TYPE_EQUAL)
@@ -1480,7 +1480,7 @@
 		 * their label.
 		 */
 		if (mac_biba_contains_equal(new)) {
-			error = mac_biba_privileged(subj);
+			error = mac_biba_subject_privileged(subj);
 			if (error)
 				return (error);
 		}
@@ -1534,7 +1534,7 @@
 	/*
 	 * Relabling network interfaces requires Biba privilege.
 	 */
-	error = mac_biba_privileged(subj);
+	error = mac_biba_subject_privileged(subj);
 	if (error)
 		return (error);
 
@@ -1684,7 +1684,7 @@
 		 * subject must have appropriate privilege.
 		 */
 		if (mac_biba_contains_equal(new)) {
-			error = mac_biba_privileged(subj);
+			error = mac_biba_subject_privileged(subj);
 			if (error)
 				return (error);
 		}
@@ -1846,7 +1846,7 @@
 		 * the subject must have appropriate privilege.
 		 */
 		if (mac_biba_contains_equal(new)) {
-			error = mac_biba_privileged(subj);
+			error = mac_biba_subject_privileged(subj);
 			if (error)
 				return (error);
 		}
@@ -1899,7 +1899,7 @@
 		if (!mac_biba_subject_dominate_high(subj))
 			return (EACCES);
 
-		error = mac_biba_privileged(subj);
+		error = mac_biba_subject_privileged(subj);
 		if (error)
 			return (error);
 	}
@@ -2266,7 +2266,7 @@
 		 * the subject must have appropriate privilege.
 		 */
 		if (mac_biba_contains_equal(new)) {
-			error = mac_biba_privileged(subj);
+			error = mac_biba_subject_privileged(subj);
 			if (error)
 				return (error);
 		}
@@ -2484,7 +2484,7 @@
 	subj = SLOT(&cred->cr_label);
 	obj = SLOT(label);
 
-	if (!mac_biba_privileged(subj))
+	if (!mac_biba_subject_privileged(subj))
 		return (EPERM);
 
 	if (!mac_biba_high_single(obj))
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message