From owner-p4-projects@FreeBSD.ORG  Thu Nov 16 21:35:40 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 217C016A4D0; Thu, 16 Nov 2006 21:35:40 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 EE8FD16A492
	for <perforce@freebsd.org>; Thu, 16 Nov 2006 21:35:39 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8133043D5D
	for <perforce@freebsd.org>; Thu, 16 Nov 2006 21:35:38 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAGLZc2n005032
	for <perforce@freebsd.org>; Thu, 16 Nov 2006 21:35:38 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAGLZcCl005029
	for perforce@freebsd.org; Thu, 16 Nov 2006 21:35:38 GMT
	(envelope-from millert@freebsd.org)
Date: Thu, 16 Nov 2006 21:35:38 GMT
Message-Id: <200611162135.kAGLZcCl005029@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 110133 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 16 Nov 2006 21:35:40 -0000

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

Change 110133 by millert@millert_macbook on 2006/11/16 21:34:37

	Adapt to mac_policy.h changes

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#22 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/policies/mls/mac_mls.c#22 (text+ko) ====

@@ -1962,12 +1962,12 @@
 
 static int
 mac_mls_file_check_fcntl(struct ucred *cred, struct fileglob *fg,
-    int cmd, long arg)
+    struct label *label, int cmd, user_long_t arg)
 {
 
 	if (!mac_mls_enabled)
 		return (0);
-	MLS_MESSAGE("file_check_fcntl:  fp %p cmd %d(%x) arg %d(%p)\n", fp, cmd, arg);
+	MLS_MESSAGE("file_check_fcntl:  fg %p cmd %d(%x) arg %lld(%llx)\n", fg, cmd, cmd, arg, arg);
 #warning Implement mac_mls_file_check_fcntl()
 	return (0);
 }
@@ -3022,7 +3022,8 @@
 }
 
 static int
-mac_mls_port_check_method(struct label *task, struct label *port, int msgid)
+mac_mls_port_check_method(struct proc *p, struct label *task,
+    struct label *port, int msgid)
 {
 	struct mac_mls *subj, *obj;
 
@@ -3373,13 +3374,13 @@
 }
 
 static int
-mac_mls_vnode_check_ioctl(struct ucred *cred, struct fileproc *fp,
-    int com, caddr_t data)
+mac_mls_vnode_check_ioctl(struct ucred *cred, struct vnode *vp,
+    struct label *label, int com, caddr_t data)
 {
 
 	if (!mac_mls_enabled)
 		return (0);
-	MLS_MESSAGE("vnode_check_ioctl:  fp %p com %d(%x) data %d(%p)\n", fp, com, data);
+	MLS_MESSAGE("vnode_check_ioctl:  fp %p com %d(%x) data %d(%p)\n", fp, com, com, data, data);
 #warning Implement mac_mls_vnode_check_ioctl()
 	return (0);
 }