From owner-p4-projects@FreeBSD.ORG Sat Oct 23 22:54:29 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C965F16A4D0; Sat, 23 Oct 2004 22:54:28 +0000 (GMT) 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 A428216A4CE for ; Sat, 23 Oct 2004 22:54:28 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8455E43D1D for ; Sat, 23 Oct 2004 22:54:28 +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.12.11/8.12.11) with ESMTP id i9NMsSgX032304 for ; Sat, 23 Oct 2004 22:54:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9NMsSDs032301 for perforce@freebsd.org; Sat, 23 Oct 2004 22:54:28 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 23 Oct 2004 22:54:28 GMT Message-Id: <200410232254.i9NMsSDs032301@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 Subject: PERFORCE change 63605 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Oct 2004 22:54:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=63605 Change 63605 by rwatson@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 #include -#include +#include /* 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 #include -#include +#include /* * 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 #include -#include +#include /* * 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 #include -#include +#include /* * 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 #include -#include +#include char *delim = ","; ==== //depot/projects/trustedbsd/audit3/contrib/bsm/lib/bsm_io.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ #include #include -#include +#include #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 #include -#include +#include /* 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 /* uint32_t */ #include /* syslog() */ #include /* syslog() */ -#include +#include /* 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 #include -#include +#include #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 #include -#include +#include /* * 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 #include /* syslog() */ #include /* STDIN_FILENO, gete[ug]id(), getpid() */ -#include +#include #include /* [f]stat() */ #include /* sysctl() */ #include /* [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