PERFORCE change 76709 for review

[Christian S.J. Peron]

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

Change 76709 by csjp at csjp_xor on 2005/05/08 20:41:49

	
	-unbreak the MACALL kernel build by adding options KDB which is now required
	 by options DDB
	-add MAC_CHKEXEC to the MACALL kernel config
	-fix handling of sha1.h header file and adjust the Makefile to so that is
	 does'nt have the sha1.h header hack. (I am not sure real sure why is was
	 hooked into the build like this in the first place).

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/i386/conf/MACALL#5 edit
.. //depot/projects/trustedbsd/mac/sys/modules/mac_chkexec/Makefile#2 edit
.. //depot/projects/trustedbsd/mac/sys/security/mac_chkexec/mac_chkexec.c#7 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/i386/conf/MACALL#5 (text+ko) ====

@@ -46,6 +46,7 @@
 options 	MAC_SEEOTHERUIDS
 options 	MAC_STUB
 options 	MAC_TEST
+options		MAC_CHKEXEC
 #options 	SEBSD
 
 options 	SCHED_4BSD		#4BSD scheduler
@@ -79,7 +80,8 @@
 # Debugging for use in -current
 options 	ALT_BREAK_TO_DEBUGGER
 options 	BREAK_TO_DEBUGGER
-options 	DDB			#Enable the kernel debugger
+options		KDB			# Enable the kernel debugger
+options 	DDB			# Support DDB.
 options 	INVARIANTS		#Enable calls of extra sanity checking
 options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
 options 	WITNESS			#Enable checks to detect deadlocks and cycles

==== //depot/projects/trustedbsd/mac/sys/modules/mac_chkexec/Makefile#2 (text+ko) ====

@@ -1,6 +1,6 @@
 .PATH: ${.CURDIR}/../../crypto
 .PATH: ${.CURDIR}/../../security/mac_chkexec
-CFLAGS+=	-I${.CURDIR}/../../crypto -g
+CFLAGS+=	-g
 # 
 # Un comment the following line to enable debugging
 CFLAGS+=	-DDEBUG

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

@@ -60,7 +60,7 @@
 #include <sys/mac_policy.h>
 #include <security/mac_chkexec/mac_chkexec.h>
 
-#include "sha1.h"
+#include <crypto/sha1.h>
 
 /*
  * Prototypes
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message