From owner-p4-projects@FreeBSD.ORG  Sun Nov  9 19:40:05 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D41CD16A4D0; Sun,  9 Nov 2003 19:40:04 -0800 (PST)
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 AB18916A4CF
	for <perforce@freebsd.org>; Sun,  9 Nov 2003 19:40:04 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AD64B43FE3
	for <perforce@freebsd.org>; Sun,  9 Nov 2003 19:40:03 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAA3e3XJ065720
	for <perforce@freebsd.org>; Sun, 9 Nov 2003 19:40:03 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAA3e3tO065716
	for perforce@freebsd.org; Sun, 9 Nov 2003 19:40:03 -0800 (PST)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sun, 9 Nov 2003 19:40:03 -0800 (PST)
Message-Id: <200311100340.hAA3e3tO065716@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 41857 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Nov 2003 03:40:05 -0000

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

Change 41857 by rwatson@rwatson_paprika on 2003/11/09 19:39:46

	SEBSD-specific updates for struct->struct* changes for labels.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#17 edit
.. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_vfs.c#5 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#17 (text+ko) ====

@@ -949,7 +949,7 @@
 	mp = nd.ni_vp->v_mount;
 
 	mac_init_mount_label(&intlabel);
-	mac_copy_mount_label(&mp->mnt_mntlabel, &intlabel);
+	mac_copy_mount_label(mp->mnt_mntlabel, &intlabel);
 	error = mac_externalize_mount_label(&intlabel, elements, buffer,
 	    mac.m_buflen, M_WAITOK);
 

==== //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_vfs.c#5 (text+ko) ====

@@ -468,7 +468,7 @@
 	if (!mac_enforce_fs)
 		return (0);
 
-	MAC_CHECK(check_mount, cred, vp, &vp->v_label, vfc_name, mntlabel);
+	MAC_CHECK(check_mount, cred, vp, vp->v_label, vfc_name, mntlabel);
 
 	return (error);
 }
@@ -480,7 +480,7 @@
 	if (!mac_enforce_fs)
 		return (0);
 
-	MAC_CHECK(check_umount, cred, mp, &mp->mnt_mntlabel);
+	MAC_CHECK(check_umount, cred, mp, mp->mnt_mntlabel);
 
 	return (error);
 }
@@ -494,7 +494,7 @@
 	if (!mac_enforce_fs)
 		return (0);
 
-	MAC_CHECK(check_remount, cred, mp, &mp->mnt_mntlabel,
+	MAC_CHECK(check_remount, cred, mp, mp->mnt_mntlabel,
 	    mount_arg_label);
 
 	return (error);