PERFORCE change 41857 for review

[Robert Watson]

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

Change 41857 by rwatson at 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);
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message