PERFORCE change 110133 for review

[Todd Miller]

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

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