From owner-p4-projects@FreeBSD.ORG  Tue Feb 28 20:58:41 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 BD02916A423; Tue, 28 Feb 2006 20:58:40 +0000 (GMT)
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 7F81716A420
	for <perforce@freebsd.org>; Tue, 28 Feb 2006 20:58:40 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1FC2143D53
	for <perforce@freebsd.org>; Tue, 28 Feb 2006 20:58:40 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1SKweNM061415
	for <perforce@freebsd.org>; Tue, 28 Feb 2006 20:58:40 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1SKwdSl061412
	for perforce@freebsd.org; Tue, 28 Feb 2006 20:58:39 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 28 Feb 2006 20:58:39 GMT
Message-Id: <200602282058.k1SKwdSl061412@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 92544 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: Tue, 28 Feb 2006 20:58:41 -0000

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

Change 92544 by rwatson@rwatson_peppercorn on 2006/02/28 20:58:09

	In the Darwin world, sysctl.h includes ucred.h, which depends on
	queue.h.  In Darwin's sysctl.h there is also an include of
	bsm/audit.h, which in the version shipped with Darwin, performs a
	nested include of queue.h.  However, our version of bsm/audit.h
	does not include queue.h, since we don't expose queue-based data
	structures in public BSM include files, which means sysctl.h has
	a missing dependency.  On Darwin, therefore, perform an additional
	include of sys/queue.h.  Ideally, Darwin will explicitly include
	sys/queue.h in sysctl.h to avoid dependence on the nested include,
	but this is not currently the case.
	
	Reported by:	Martin Fong <martin dot fong at sri dot com>

Affected files ...

.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 (text+ko) ====

@@ -26,7 +26,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#17 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 $
  */
 
 #ifdef __APPLE__
@@ -35,6 +35,11 @@
 
 #include <sys/param.h>
 #include <sys/stat.h>
+
+#ifdef __APPLE__
+#include <sys/queue.h>		/* Our bsm/audit.h doesn't include queue.h. */
+#endif
+
 #include <sys/sysctl.h>
 
 #include <bsm/libbsm.h>