PERFORCE change 125816 for review

[Robert Watson]

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

Change 125816 by rwatson at 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>