PERFORCE change 63605 for review

[Robert Watson]

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

Change 63605 by rwatson at rwatson_tislabs on 2004/10/23 22:53:47

	Revert local change to include libbsm.h via bsm directory --
	instead just add the bsm/lib directory to the include search
	path.

Affected files ...

.. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_audit.c#3 edit
.. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_class.c#3 edit
.. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_control.c#3 edit
.. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_event.c#3 edit
.. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_flags.c#3 edit
.. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_io.c#3 edit
.. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_mask.c#3 edit
.. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_notify.c#3 edit
.. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_token.c#4 edit
.. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_user.c#3 edit
.. //depot/projects/trustedbsd/audit3/contrib/bsm/lib/lib_wrappers.c#3 edit
.. //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#4 edit

Differences ...

==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_audit.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 #include <sys/syscall.h>
 #include <sys/types.h>
 
-#include <bsm/libbsm.h>
+#include <libbsm.h>
 
 /* array of used descriptors */
 static au_record_t* open_desc_table[MAX_AUDIT_RECORDS]; 

==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_class.c#3 (text+ko) ====

@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <bsm/libbsm.h>
+#include <libbsm.h>
 
 /*
  * Parse the contents of the audit_class file to return 

==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_control.c#3 (text+ko) ====

@@ -32,7 +32,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include <bsm/libbsm.h>
+#include <libbsm.h>
 
 /* 
  * Parse the contents of the audit_control file to return 

==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_event.c#3 (text+ko) ====

@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <bsm/libbsm.h>
+#include <libbsm.h>
 
 /*
  * Parse the contents of the audit_event file to return

==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_flags.c#3 (text+ko) ====

@@ -29,7 +29,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <bsm/libbsm.h>
+#include <libbsm.h>
 
 char *delim = ",";
 

==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_io.c#3 (text+ko) ====

@@ -40,7 +40,7 @@
 #include <pwd.h>
 #include <grp.h>
 
-#include <bsm/libbsm.h>
+#include <libbsm.h>
 
 #define READ_TOKEN_BYTES(buf, len, dest, size, bytesread, err)	\
 	do {\

==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_mask.c#3 (text+ko) ====

@@ -31,7 +31,7 @@
 #include <pthread.h>
 #include <stdlib.h>
 
-#include <bsm/libbsm.h>
+#include <libbsm.h>
 
 /* MT-Safe */
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;

==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_notify.c#3 (text+ko) ====

@@ -35,7 +35,7 @@
 #include <stdint.h>	/* uint32_t */
 #include <syslog.h>	/* syslog() */
 #include <stdarg.h>	/* syslog() */
-#include <bsm/libbsm.h>
+#include <libbsm.h>
 
 /* if 1, assumes a kernel that sends the right notification */
 #define AUDIT_NOTIFICATION_ENABLED	1

==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_token.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#include <bsm/libbsm.h>
+#include <libbsm.h>
 
 #define GET_TOKEN_AREA(t, dptr, length) \
         do {\

==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_user.c#3 (text+ko) ====

@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <bsm/libbsm.h>
+#include <libbsm.h>
 
 /*
  * Parse the contents of the audit_user file into au_user_ent structures

==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/lib_wrappers.c#3 (text+ko) ====

@@ -34,7 +34,7 @@
 #include <string.h>
 #include <syslog.h>		/* syslog() */
 #include <unistd.h>		/* STDIN_FILENO, gete[ug]id(), getpid() */
-#include <bsm/libbsm.h>
+#include <libbsm.h>
 #include <sys/stat.h>	/* [f]stat() */
 #include <sys/sysctl.h>	/* sysctl() */
 #include <sys/types.h>	/* [f]stat(), sysctl(), gete[ug]id(), getpid() */

==== //depot/projects/trustedbsd/audit3/lib/libbsm/Makefile#4 (text+ko) ====

@@ -15,7 +15,7 @@
 #
 # Must use BSM include files from within the contrib area, not the system.
 #
-CFLAGS+=	-I${BSMDIR}
+CFLAGS+=	-I${BSMDIR}/lib
 
 INCS=		audit_uevents.h libbsm.h
 INCSDIR=	${INCLUDEDIR}/bsm
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message