PERFORCE change 43678 for review

[Chris Vance]

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

Change 43678 by cvance at cvance_sony on 2003/12/09 08:03:43

	Patch up sebsd kernel, just a small collection of miss-merges from 
	the MAC branch.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/vfs_mount.c#8 edit
.. //depot/projects/trustedbsd/sebsd/sys/security/mac/mac_vfs.c#9 edit
.. //depot/projects/trustedbsd/sebsd/sys/security/mac_test/mac_test.c#10 edit

Differences ...

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

@@ -107,8 +107,8 @@
 static int	vfs_mount_alloc(struct vnode *, struct vfsconf *,
 		    const char *, struct thread *,
 		    struct label *, struct mount **);
-static int	vfs_domount(struct thread *, struct label *mntlabel,
-		    const char *, char *, int fsflags, void *fsdata,
+static int	vfs_domount(struct thread *, const char *, char *, 
+		    int fsflags, void *fsdata, struct label *mntlabel, 
 		    int compat);
 static void	gets(char *cp);
 
@@ -640,7 +640,7 @@
  * into userspace.
  */
 int
-vfs_mount(td, fstype, fspath, fsflags, fsdata)
+vfs_mount(td, fstype, fspath, fsflags, fsdata, mntlabel)
         struct thread *td;
         const char *fstype;
         char *fspath;

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

@@ -248,7 +248,7 @@
 {
 	int error;
 
-	MAC_EXTERNALIZE(mount_label, label, elements, outbuf, outbuflen);
+	MAC_EXTERNALIZE(mount, label, elements, outbuf, outbuflen);
 
 	return (error);
 }
@@ -269,7 +269,7 @@
 {
 	int error;
 
-	MAC_INTERNALIZE(mount_label, label, string);
+	MAC_INTERNALIZE(mount, label, string);
 
 	return (error);
 }

==== //depot/projects/trustedbsd/sebsd/sys/security/mac_test/mac_test.c#10 (text+ko) ====

@@ -840,7 +840,7 @@
 }
 
 static void
-mac_test_create_devfs_device(struct mount *mp, dev_t dev,
+mac_test_create_devfs_device(struct ucred *cr, struct mount *mp, dev_t dev,
     struct devfs_dirent *devfs_dirent, struct label *label,
     const char *fullpath)
 {
@@ -883,7 +883,7 @@
 
 static void
 mac_test_create_mount(struct ucred *cred, struct mount *mp,
-    struct label *mntlabel, struct label *fslabel)
+    struct label *mntlabel, struct label *fslabel, struct label *mount_arg)
 {
 
 	ASSERT_CRED_LABEL(cred->cr_label);
@@ -1367,7 +1367,7 @@
 static int
 mac_test_check_cap(struct ucred *cred, cap_value_t capv)
 {
-  ASSERT_CRED_LABEL(&cred->cr_label);
+  ASSERT_CRED_LABEL(cred->cr_label);
   return 0;
 }