From owner-p4-projects@FreeBSD.ORG  Wed Aug 29 13:32:35 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D58E616A469; Wed, 29 Aug 2007 13:32:34 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB2E316A420
	for <perforce@freebsd.org>; Wed, 29 Aug 2007 13:32:34 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 99A1713C4D3
	for <perforce@freebsd.org>; Wed, 29 Aug 2007 13:32:34 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7TDWYP9065115
	for <perforce@freebsd.org>; Wed, 29 Aug 2007 13:32:34 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7TDWYEj065112
	for perforce@freebsd.org; Wed, 29 Aug 2007 13:32:34 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Wed, 29 Aug 2007 13:32:34 GMT
Message-Id: <200708291332.l7TDWYEj065112@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 125816 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: Wed, 29 Aug 2007 13:32:35 -0000

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

Change 125816 by rwatson@rwatson_zoo on 2007/08/29 13:32:12

	Update branch code for new argument spellings, include file
	changes.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#268 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_chkexec/mac_chkexec.c#17 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#104 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/security/mac_biba/mac_biba.c#268 (text+ko) ====

@@ -1274,7 +1274,7 @@
 	p = q = tiflist;
 	while ((p = strsep(&q, ", \t")) != NULL) {
 		if (strlen(p) < IFNAMSIZ) {
-			if (strcmp(p, ifnet->if_xname) == 0) {
+			if (strcmp(p, ifp->if_xname) == 0) {
 				type = MAC_BIBA_TYPE_HIGH;
 				break;
 			}

==== //depot/projects/trustedbsd/mac/sys/security/mac_chkexec/mac_chkexec.c#17 (text+ko) ====

@@ -33,7 +33,6 @@
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/mman.h>
-#include <sys/mac.h>
 #include <sys/md5.h>
 #include <sys/malloc.h>
 #include <sys/mount.h>
@@ -60,7 +59,7 @@
 
 #include <vm/vm.h>
 
-#include <sys/mac_policy.h>
+#include <security/mac/mac_policy.h>
 #include <security/mac_chkexec/mac_chkexec.h>
 
 #include <crypto/sha1.h>

==== //depot/projects/trustedbsd/mac/sys/security/mac_lomac/mac_lomac.c#104 (text+ko) ====

@@ -46,6 +46,7 @@
 #include <sys/conf.h>
 #include <sys/extattr.h>
 #include <sys/kernel.h>
+#include <sys/ksem.h>
 #include <sys/malloc.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
@@ -68,8 +69,6 @@
 #include <sys/sem.h>
 #include <sys/shm.h>
 
-#include <posix4/ksem.h>
-
 #include <fs/devfs/devfs.h>
 
 #include <net/bpfdesc.h>