From owner-p4-projects@FreeBSD.ORG  Sat Jun 21 20:51:05 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 49CCA37B404; Sat, 21 Jun 2003 20:51:05 -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 F34A037B401
	for <perforce@freebsd.org>; Sat, 21 Jun 2003 20:51:04 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9370643FB1
	for <perforce@freebsd.org>; Sat, 21 Jun 2003 20:51:04 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5M3p40U021425
	for <perforce@freebsd.org>; Sat, 21 Jun 2003 20:51:04 -0700 (PDT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5M3p3cM021419
	for perforce@freebsd.org; Sat, 21 Jun 2003 20:51:03 -0700 (PDT)
Date: Sat, 21 Jun 2003 20:51:03 -0700 (PDT)
Message-Id: <200306220351.h5M3p3cM021419@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 33500 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Jun 2003 03:51:06 -0000

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

Change 33500 by rwatson@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.