From owner-p4-projects@FreeBSD.ORG Wed Jun 29 16:47:59 2005 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70EFB16A420; Wed, 29 Jun 2005 16:47:59 +0000 (GMT) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3574316A41C for ; Wed, 29 Jun 2005 16:47:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1239F43D55 for ; Wed, 29 Jun 2005 16:47:59 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5TGlwPa025973 for ; Wed, 29 Jun 2005 16:47:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5TGlwS4025970 for perforce@freebsd.org; Wed, 29 Jun 2005 16:47:58 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 29 Jun 2005 16:47:58 GMT Message-Id: <200506291647.j5TGlwS4025970@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 To: Perforce Change Reviews Cc: Subject: PERFORCE change 79155 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jun 2005 16:48:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=79155 Change 79155 by rwatson@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 + #include #include #include @@ -45,7 +47,6 @@ #include #include -#include #include "auditreduce.h" ==== //depot/projects/trustedbsd/openbsm/bin/praudit/praudit.c#2 (text+ko) ==== @@ -34,12 +34,12 @@ * praudit [-lrs] [-ddel] [filenames] */ +#include + #include #include #include -#include - 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 #include +#include #include -#include #include #include #include ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_class.c#4 (text+ko) ==== @@ -26,13 +26,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include + #include #include #include #include -#include - /* * 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 + #include #include #include #include #include -#include - /* * 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 + #include #include #include #include -#include - /* * 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 + #include #include -#include - static const char *delim = ","; /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#14 (text+ko) ==== @@ -37,6 +37,8 @@ #include #include +#include + #include #include #include @@ -51,8 +53,6 @@ #include -#include - #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 #include + +#include + #include #include -#include - /* 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 #include /* strerror() */ #include /* errno */ +#include #include /* uint32_t */ #include /* syslog() */ #include /* syslog() */ -#include /* 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 #include - -#include +#include #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 + #include #include #include #include -#include - /* * 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 #include #include + +#include + #include #include #include #include #include -#include /* These are not advertised in libbsm.h */ int audit_set_terminal_port(dev_t *p);