PERFORCE change 111486 for review

[Todd Miller]

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

Change 111486 by millert at 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);
 }