PERFORCE change 16111 for review

[Robert Watson]

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=16111

Change 16111 by rwatson at rwatson_tislabs on 2002/08/16 07:04:16

	Continue rename of SETLABEL to SETMAC per integ'd change.

Affected files ...

.. //depot/projects/trustedbsd/mac/lib/libutil/login_class.c#7 edit
.. //depot/projects/trustedbsd/mac/usr.bin/su/su.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/mac/lib/libutil/login_class.c#7 (text+ko) ====

@@ -377,7 +377,7 @@
     }
 
     /* Setup the user's MAC label. */
-    if (flags & LOGIN_SETLABEL && mac_is_present_np(NULL) == 1) {
+    if (flags & LOGIN_SETMAC && mac_is_present_np(NULL) == 1) {
 	char *label_string;
 	mac_t label;
 

==== //depot/projects/trustedbsd/mac/usr.bin/su/su.c#11 (text+ko) ====

@@ -362,12 +362,12 @@
 		 */
 		setwhat = LOGIN_SETALL & ~(LOGIN_SETENV | LOGIN_SETUMASK |
 			   LOGIN_SETLOGIN | LOGIN_SETPATH | LOGIN_SETGROUP |
-			   LOGIN_SETLABEL);
+			   LOGIN_SETMAC);
 		/*
 		 * If -s is present, also set the MAC label.
 		 */
 		if (setmaclabel)
-			setwhat |= LOGIN_SETLABEL;
+			setwhat |= LOGIN_SETMAC;
 		/*
 		 * Don't touch resource/priority settings if -m has been used
 		 * or -l and -c hasn't, and we're not su'ing to root.
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message