PERFORCE change 33500 for review

[Robert Watson]

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

Change 33500 by rwatson at rwatson_powerbook on 2003/06/21 20:50:47

	Add labels to the mount structure; define the MNT_MULTILABEL flag
	to indicate a file system is or should be mounted with label
	support for each object individually.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mount.h#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/apsl/xnu/bsd/sys/mount.h#2 (text+ko) ====

@@ -66,6 +66,7 @@
 #include <sys/lock.h>
 #include <net/radix.h>
 #include <sys/socket.h>		/* XXX for AF_MAX */
+#include <sys/_label.h>
 
 typedef struct fsid { int32_t val[2]; } fsid_t;	/* file system id type */
 
@@ -141,6 +142,8 @@
 	u_int32_t	mnt_maxwritecnt;	/* Max. byte count for write */
 	u_int16_t	mnt_segreadcnt;	/* Max. segment count for read */
 	u_int16_t	mnt_segwritecnt;	/* Max. segment count for write */
+	struct label	mnt_mntlabel;		/* MAC label for the mount */
+	struct label	mnt_fslabel;		/* MAC label for the fs */
 };
 #endif /* __APPLE_API_PRIVATE */
 
@@ -160,6 +163,7 @@
 #define MNT_UNKNOWNPERMISSIONS 0x00200000 /* no known mapping for uid/gid in permissions information on disk */
 #define MNT_AUTOMOUNTED 0x00400000	/* filesystem was mounted by automounter */
 #define MNT_JOURNALED   0x00800000  /* filesystem is journaled */
+#define MNT_MULTILABEL	0x01000000	/* MAC support for individual objects */
 
 /*
  * NFS export related mount flags.
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message