From owner-p4-projects@FreeBSD.ORG Thu Aug 24 11:08:54 2006 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 68EAC16A4EA; Thu, 24 Aug 2006 11:08:54 +0000 (UTC) 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 1322B16A4E7 for ; Thu, 24 Aug 2006 11:08:54 +0000 (UTC) (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 BCC8043D49 for ; Thu, 24 Aug 2006 11:08:53 +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.6/8.13.6) with ESMTP id k7OB8qsB062522 for ; Thu, 24 Aug 2006 11:08:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7OB8qKY062519 for perforce@freebsd.org; Thu, 24 Aug 2006 11:08:52 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 24 Aug 2006 11:08:52 GMT Message-Id: <200608241108.k7OB8qKY062519@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 104914 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: Thu, 24 Aug 2006 11:08:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=104914 Change 104914 by rwatson@rwatson_sesame on 2006/08/24 11:08:46 Merge OpenBSM 1.0a9 changes from contrib/openbsm to the kernel in the TrustedBSD audit3 branch. More merge work likely required. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#11 integrate .. //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#19 integrate .. //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#23 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#11 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#10 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#11 $ * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.2 2006/03/04 16:54:21 rwatson Exp $ */ @@ -69,15 +69,15 @@ typedef struct au_record au_record_t; -/* We could determined the header and trailer sizes by - * defining appropriate structures. We hold off that approach - * till we have a consistant way of using structures for all tokens. - * This is not straightforward since these token structures may - * contain pointers of whose contents we dont know the size - * (e.g text tokens) +/* + * We could determined the header and trailer sizes by defining appropriate + * structures. We hold off that approach until we have a consistant way of + * using structures for all tokens. This is not straightforward since these + * token structures may contain pointers of whose contents we dont know the + * size (e.g text tokens). */ -#define BSM_HEADER_SIZE 18 -#define BSM_TRAILER_SIZE 7 +#define AUDIT_HEADER_SIZE 18 +#define AUDIT_TRAILER_SIZE 7 /* * BSM token streams store fields in big endian byte order, so as to be ==== //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#19 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#18 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#19 $ * $FreeBSD: src/sys/bsm/audit_record.h,v 1.3 2006/07/03 14:44:13 rwatson Exp $ */ @@ -200,7 +200,7 @@ #define PAD_NOTATTR 0x4000 /* nonattributable event */ #define PAD_FAILURE 0x8000 /* fail audit event */ -#define BSM_MAX_GROUPS 16 +#define AUDIT_MAX_GROUPS 16 /* * A number of BSM versions are floating around and defined. Here are @@ -208,11 +208,11 @@ * Solaris BSM version, but has a separate version number in order to * identify a potentially different event identifier name space. */ -#define BSM_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ -#define BSM_HEADER_VERSION_SOLARIS 2 -#define BSM_HEADER_VERSION_TSOL25 3 -#define BSM_HEADER_VERSION_TSOL 4 -#define BSM_HEADER_VERSION_OPENBSM 10 +#define AUDIT_HEADER_VERSION_OLDDARWIN 1 /* In retrospect, a mistake. */ +#define AUDIT_HEADER_VERSION_SOLARIS 2 +#define AUDIT_HEADER_VERSION_TSOL25 3 +#define AUDIT_HEADER_VERSION_TSOL 4 +#define AUDIT_HEADER_VERSION_OPENBSM 10 /* * BSM define is AUT_TRAILER_MAGIC; Apple BSM define is TRAILER_PAD_MAGIC; we ==== //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#23 (text+ko) ==== @@ -30,7 +30,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#22 $ + * $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#23 $ * $FreeBSD: src/sys/security/audit/audit_bsm_token.c,v 1.4 2006/06/17 13:53:04 wsalamon Exp $ */ @@ -270,7 +270,7 @@ au_to_groups(int *groups) { - return (au_to_newgroups(BSM_MAX_GROUPS, groups)); + return (au_to_newgroups(AUDIT_MAX_GROUPS, groups)); } /* @@ -1166,7 +1166,7 @@ ADD_U_CHAR(dptr, AUT_HEADER32); ADD_U_INT32(dptr, rec_size); - ADD_U_CHAR(dptr, BSM_HEADER_VERSION_OPENBSM); + ADD_U_CHAR(dptr, AUDIT_HEADER_VERSION_OPENBSM); ADD_U_INT16(dptr, e_type); ADD_U_INT16(dptr, e_mod);