From owner-p4-projects  Fri Aug 16  7: 5:12 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8D5E637B401; Fri, 16 Aug 2002 07:05:08 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4390C37B400
	for <perforce@freebsd.org>; Fri, 16 Aug 2002 07:05:08 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F37DA43E70
	for <perforce@freebsd.org>; Fri, 16 Aug 2002 07:05:07 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.4/8.12.4) with ESMTP id g7GE57JU002562
	for <perforce@freebsd.org>; Fri, 16 Aug 2002 07:05:07 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.4/8.12.4/Submit) id g7GE57Rs002509
	for perforce@freebsd.org; Fri, 16 Aug 2002 07:05:07 -0700 (PDT)
Date: Fri, 16 Aug 2002 07:05:07 -0700 (PDT)
Message-Id: <200208161405.g7GE57Rs002509@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
Subject: PERFORCE change 16111 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 16111 by rwatson@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@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message