PERFORCE change 15620 for review

[Robert Watson]

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

Change 15620 by rwatson at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message