From owner-p4-projects@FreeBSD.ORG  Mon Dec 11 22:03:11 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 C8BF516A5B3; 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 A54CC16A5AC
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 22:03:10 +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 C7B0C444F9
	for <perforce@freebsd.org>; Mon, 11 Dec 2006 21:40:09 +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 kBBLfKC8096801
	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 kBBLfKuU096794
	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.kBBLfKuU096794@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 111485 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:11 -0000

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

Change 111485 by millert@millert_g5tower on 2006/12/11 21:40:34

	mac_iokit_check_device() needs to be in mac_framework too.
	While there, fix its prototype.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#11 edit
.. //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#26 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac.h#11 (text+ko) ====

@@ -118,7 +118,7 @@
  * I/O Kit device access control.
  * Note that this routine is called from a C++ I/O Kit driver.
  */
-int	mac_iokit_check_device(char *devtype, struct module_data *mdata);
+int	mac_iokit_check_device(char *devtype, struct mac_module_data *mdata);
 __END_DECLS
 #endif
 

==== //depot/projects/trustedbsd/sedarwin8/darwin/xnu/security/mac_framework.h#26 (text+ko) ====

@@ -62,6 +62,7 @@
 struct ifnet;
 struct lctx;
 struct mac;
+struct mac_module_data;
 struct mount;
 struct pseminfo;
 struct pshminfo;
@@ -145,6 +146,7 @@
 void	mac_file_label_associate(struct ucred *cred, struct fileglob *fg);
 void	mac_file_label_destroy(struct fileglob *fg);
 void	mac_file_label_init(struct fileglob *fg);
+int	mac_iokit_check_device(char *devtype, struct mac_module_data *mdata);
 int	mac_lctx_check_label_update(struct lctx *l, struct label *newlabel);
 struct label	*mac_lctx_label_alloc(void);
 void    mac_lctx_label_free(struct label *label);