From owner-p4-projects  Tue Aug  6 11:14: 0 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ACF2F37B401; Tue,  6 Aug 2002 11:13:53 -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 68DD937B400
	for <perforce@freebsd.org>; Tue,  6 Aug 2002 11:13:53 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 234C443E7B
	for <perforce@freebsd.org>; Tue,  6 Aug 2002 11:13:53 -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 g76IDrJU094177
	for <perforce@freebsd.org>; Tue, 6 Aug 2002 11:13:53 -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 g76IDqqb094174
	for perforce@freebsd.org; Tue, 6 Aug 2002 11:13:52 -0700 (PDT)
Date: Tue, 6 Aug 2002 11:13:52 -0700 (PDT)
Message-Id: <200208061813.g76IDqqb094174@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 15620 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=15620

Change 15620 by rwatson@rwatson_tislabs on 2002/08/06 11:13:22

	Various fixes from last submit.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/kern_mac.c#228 edit
.. //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#74 edit

Differences ...

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

@@ -1744,7 +1744,7 @@
 
 	ASSERT_VOP_LOCKED(vp, "mac_check_vnode_poll");
 
-	error = vn_refreshlabel(vp, cred);
+	error = vn_refreshlabel(vp, active_cred);
 	if (error)
 		return (error);
 
@@ -1764,7 +1764,7 @@
 
 	ASSERT_VOP_LOCKED(vp, "mac_check_vnode_read");
 
-	error = vn_refreshlabel(vp, cred);
+	error = vn_refreshlabel(vp, active_cred);
 	if (error)
 		return (error);
 
@@ -2036,7 +2036,7 @@
 
 	ASSERT_VOP_LOCKED(vp, "mac_check_vnode_write");
 
-	error = vn_refreshlabel(vp, cred);
+	error = vn_refreshlabel(vp, active_cred);
 	if (error)
 		return (error);
 

==== //depot/projects/trustedbsd/mac/sys/kern/vfs_syscalls.c#74 (text+ko) ====

@@ -2398,7 +2398,7 @@
 	if (vp->v_type == VDIR)
 		error = EISDIR;
 #ifdef MAC
-	else if ((error = mac_check_vnode_write(td->td_ucred, NOCRED, vp) {
+	else if ((error = mac_check_vnode_write(td->td_ucred, NOCRED, vp))) {
 	}
 #endif
 	else if ((error = vn_writechk(vp)) == 0 &&
@@ -2456,7 +2456,8 @@
 	if (vp->v_type == VDIR)
 		error = EISDIR;
 #ifdef MAC
-	else if ((error = mac_check_vnode_write(td->td_ucred, fp->f_cred, vp) {
+	else if ((error = mac_check_vnode_write(td->td_ucred, fp->f_cred,
+	    vp))) {
 	}
 #endif
 	else if ((error = vn_writechk(vp)) == 0) {

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message