PERFORCE change 79155 for review
Robert Watson
rwatson at FreeBSD.org
Wed Jun 29 16:47:58 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=79155
Change 79155 by rwatson at rwatson_zoo on 2005/06/29 16:47:29
Correct misapprehension on my part: we install libbsm.h into
/usr/include/bsm, so we should lay out OpenBSM under that assumption.
That way libbsm builds with the same include layout assumptions as
everything else.
Affected files ...
.. //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#4 edit
.. //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#2 edit
.. //depot/projects/trustedbsd/openbsm/bsm/Makefile#5 edit
.. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#1 branch
.. //depot/projects/trustedbsd/openbsm/libbsm/Makefile#9 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#13 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#4 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#5 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#4 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#5 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#14 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#5 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#6 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#17 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#5 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#9 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/libbsm.h#10 delete
Differences ...
==== //depot/projects/trustedbsd/openbsm/bin/auditreduce/auditreduce.c#4 (text+ko) ====
@@ -37,6 +37,8 @@
* XXX the records present within the file and between the files themselves
*/
+#include <bsm/libbsm.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@ -45,7 +47,6 @@
#include <pwd.h>
#include <grp.h>
-#include <libbsm.h>
#include "auditreduce.h"
==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#2 (text+ko) ====
@@ -34,12 +34,12 @@
* praudit [-lrs] [-ddel] [filenames]
*/
+#include <bsm/libbsm.h>
+
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <libbsm.h>
-
extern char *optarg;
extern int optind, optopt, opterr,optreset;
==== //depot/projects/trustedbsd/openbsm/bsm/Makefile#5 (text+ko) ====
@@ -6,7 +6,8 @@
audit_internal.h \
audit_kevents.h \
audit_record.h \
- audit_uevents.h
+ audit_uevents.h \
+ libbsm.h
TARGET= ${DESTDIR}/usr/include/bsm
==== //depot/projects/trustedbsd/openbsm/libbsm/Makefile#9 (text+ko) ====
@@ -9,7 +9,6 @@
CFLAGS+=-I- \
-I .. \
- -I . \
-Wall
SRCS= bsm_audit.c \
@@ -24,9 +23,6 @@
bsm_user.c \
bsm_wrappers.c
-INCS= libbsm.h
-INCSDIR= ${INCLUDEDIR}/${LIB}
-
MAN= libbsm.3 \
au_class.3 \
au_control.3 \
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#13 (text+ko) ====
@@ -32,9 +32,9 @@
#include <sys/queue.h>
#include <bsm/audit_internal.h>
+#include <bsm/libbsm.h>
#include <errno.h>
-#include <libbsm.h>
#include <pthread.h>
#include <stdlib.h>
#include <string.h>
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#4 (text+ko) ====
@@ -26,13 +26,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <bsm/libbsm.h>
+
#include <string.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
-#include <libbsm.h>
-
/*
* Parse the contents of the audit_class file to return struct au_class_ent
* entries.
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_control.c#5 (text+ko) ====
@@ -26,14 +26,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <bsm/libbsm.h>
+
#include <errno.h>
#include <string.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
-#include <libbsm.h>
-
/*
* Parse the contents of the audit_control file to return the audit control
* parameters.
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_event.c#4 (text+ko) ====
@@ -26,13 +26,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <bsm/libbsm.h>
+
#include <string.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
-#include <libbsm.h>
-
/*
* Parse the contents of the audit_event file to return
* au_event_ent entries
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_flags.c#5 (text+ko) ====
@@ -26,11 +26,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <bsm/libbsm.h>
+
#include <stdio.h>
#include <string.h>
-#include <libbsm.h>
-
static const char *delim = ",";
/*
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#14 (text+ko) ====
@@ -37,6 +37,8 @@
#include <sys/stat.h>
#include <sys/socket.h>
+#include <bsm/libbsm.h>
+
#include <unistd.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@@ -51,8 +53,6 @@
#include <bsm/audit_internal.h>
-#include <libbsm.h>
-
#define READ_TOKEN_BYTES(buf, len, dest, size, bytesread, err) do { \
if (bytesread + size > len) { \
err = 1; \
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#5 (text+ko) ====
@@ -28,11 +28,12 @@
#include <sys/types.h>
#include <sys/queue.h>
+
+#include <bsm/libbsm.h>
+
#include <pthread.h>
#include <stdlib.h>
-#include <libbsm.h>
-
/* MT-Safe */
static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
static int firsttime = 1;
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#6 (text+ko) ====
@@ -34,10 +34,10 @@
#include <notify.h>
#include <string.h> /* strerror() */
#include <sys/errno.h> /* errno */
+#include <bsm/libbsm.h>
#include <stdint.h> /* uint32_t */
#include <syslog.h> /* syslog() */
#include <stdarg.h> /* syslog() */
-#include <libbsm.h>
/* If 1, assumes a kernel that sends the right notification. */
#define AUDIT_NOTIFICATION_ENABLED 1
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#17 (text+ko) ====
@@ -51,8 +51,7 @@
#include <sys/socketvar.h>
#include <bsm/audit_internal.h>
-
-#include <libbsm.h>
+#include <bsm/libbsm.h>
#define GET_TOKEN_AREA(t, dptr, length) do { \
t = malloc (sizeof(token_t)); \
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#5 (text+ko) ====
@@ -26,13 +26,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include <bsm/libbsm.h>
+
#include <string.h>
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
-#include <libbsm.h>
-
/*
* Parse the contents of the audit_user file into au_user_ent structures.
*/
==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#9 (text+ko) ====
@@ -29,12 +29,14 @@
#include <sys/param.h>
#include <sys/stat.h>
#include <sys/sysctl.h>
+
+#include <bsm/libbsm.h>
+
#include <unistd.h>
#include <syslog.h>
#include <stdarg.h>
#include <string.h>
#include <errno.h>
-#include <libbsm.h>
/* These are not advertised in libbsm.h */
int audit_set_terminal_port(dev_t *p);
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list