PERFORCE change 36609 for review

[Robert Watson]

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

Change 36609 by rwatson at rwatson_tislabs on 2003/08/21 10:53:03

	Slightly clean up logic for relabel checking: if a label contains
	at least one of the two flags, that doesn't imply that at least
	one of the flags isn't set.  Instead of always overwriting one
	of the fields in the new label, only overwrite them if they're
	not defined on the new version of the label yet.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#64 edit

Differences ...

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

@@ -1613,7 +1613,7 @@
 		 */
 		if ((new->ml_flags & MAC_LOMAC_FLAG_SINGLE) == 0)
 			mac_lomac_copy_single(subj, new);
-		else
+		if ((new->ml_flags & MAC_LOMAC_FLAG_RANGE) == 0)
 			mac_lomac_copy_range(subj, new);
 			
 		/*
@@ -1705,7 +1705,7 @@
 		 */
 		if ((new->ml_flags & MAC_LOMAC_FLAG_SINGLE) == 0)
 			mac_lomac_copy_single(subj, new);
-		else
+		if ((new->ml_flags & MAC_LOMAC_FLAG_RANGE) == 0)
 			mac_lomac_copy_range(subj, new);
 
 		/*
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message