From owner-p4-projects@FreeBSD.ORG  Mon Dec 11 22:03:10 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 4F84516A509; Mon, 11 Dec 2006 22:03:10 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id DAFE816A50E
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 22:03:09 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4892B444ED
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 21:40:02 +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 kBBLfKgt096807
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 21:41:20 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kBBLfKlM096804
	for perforce@freebsd.org; Mon, 11 Dec 2006 21:41:20 GMT
	(envelope-from millert@freebsd.org)
Date: Mon, 11 Dec 2006 21:41:20 GMT
Message-Id: <200612112141.kBBLfKlM096804@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 111486 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: Mon, 11 Dec 2006 22:03:10 -0000

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

Change 111486 by millert@millert_g5tower on 2006/12/11 21:41:00

	Sync with ioctl/fsctl cmd arg type change.

Affected files ...

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

Differences ...

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

@@ -2056,12 +2056,12 @@
 
 static int
 mac_mls_file_check_ioctl(struct ucred *cred, struct fileglob *fg,
-    struct label *fdlabel, unsigned long com)
+    struct label *fdlabel, unsigned int cmd)
 {
 
 	if (!mac_mls_enabled)
 		return (0);
-	MLS_MESSAGE("file_check_ioctl:  fp %p com %d(%x)\n", fp, com);
+	MLS_MESSAGE("file_check_ioctl:  fp %p cmd %u(%x)\n", fp, cmd);
 #warning Implement mac_mls_file_check_ioctl()
 	return (0);
 }
@@ -2767,12 +2767,12 @@
 
 static int
 mac_mls_mount_check_fsctl(struct ucred *cred, struct mount *mp,
-    struct label *mntlabel, int com)
+    struct label *mntlabel, unsigned int cmd)
 {
 
 	if (!mac_mls_enabled)
 		return (0);
-	MLS_MESSAGE("file_check_fsctl:  mp %p com %d(%x)\n", mp, com, data);
+	MLS_MESSAGE("file_check_fsctl:  mp %p cmd %u(%x)\n", mp, cmd, cmd);
 #warning Implement mac_mls_file_check_fsctl()
 	return (0);
 }
@@ -2855,7 +2855,7 @@
 
 static int
 mac_mls_pipe_check_ioctl(struct ucred *cred, struct pipe *cpipe,
-    struct label *pipelabel, unsigned long cmd)
+    struct label *pipelabel, unsigned int cmd)
 {
 	struct mac_mls *subj, *obj;
 
@@ -3446,12 +3446,12 @@
 
 static int
 mac_mls_vnode_check_ioctl(struct ucred *cred, struct vnode *vp,
-    struct label *label, int com)
+    struct label *label, unsigned int cmd)
 {
 
 	if (!mac_mls_enabled)
 		return (0);
-	MLS_MESSAGE("vnode_check_ioctl:  vp %p com %d(%x)\n", vp, com, com);
+	MLS_MESSAGE("vnode_check_ioctl:  vp %p cmd %u(%x)\n", vp, cmd, cmd);
 #warning Implement mac_mls_vnode_check_ioctl()
 	return (0);
 }