From owner-trustedbsd-cvs@FreeBSD.ORG Wed Aug 23 06:15:19 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 29C5316A4FB for ; Wed, 23 Aug 2006 06:15:19 +0000 (UTC) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id 67BBC43D6E for ; Wed, 23 Aug 2006 06:15:16 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id B600846CF4 for ; Wed, 23 Aug 2006 02:15:15 -0400 (EDT) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 146865568D; Wed, 23 Aug 2006 06:15:15 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CBDA16A4E0; Wed, 23 Aug 2006 06:15:15 +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 C2DB916A4DE for ; Wed, 23 Aug 2006 06:15:14 +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 53BFF43D6E for ; Wed, 23 Aug 2006 06:15:14 +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 k7N6FEgR007443 for ; Wed, 23 Aug 2006 06:15:14 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 k7N6FDCN007440 for perforce@freebsd.org; Wed, 23 Aug 2006 06:15:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 23 Aug 2006 06:15:13 GMT Message-Id: <200608230615.k7N6FDCN007440@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 104828 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Aug 2006 06:15:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=104828 Change 104828 by rwatson@rwatson_sesame on 2006/08/23 06:14:44 Rename more OpenBSM-specific constants from BSM_ to AUDIT_, including the header version identifiers, and maximum groups/args/env values. Suggested by: Martin Englund Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#23 edit .. //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#27 edit .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#51 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#23 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#22 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#23 $ */ #ifndef _BSM_AUDIT_RECORD_H_ @@ -199,7 +199,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 @@ -207,11 +207,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/openbsm/bsm/libbsm.h#27 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#26 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/libbsm.h#27 $ */ #ifndef _LIBBSM_H_ @@ -37,8 +37,8 @@ * solely to allow OpenSSH to compile; Darwin/Apple code should not use them. */ -#define BSM_MAX_ARGS 10 -#define BSM_MAX_ENV 10 +#define AUDIT_MAX_ARGS 10 +#define AUDIT_MAX_ENV 10 #include #include @@ -218,7 +218,7 @@ */ typedef struct { u_int32_t count; - char *text[BSM_MAX_ARGS]; + char *text[AUDIT_MAX_ARGS]; } au_execarg_t; /* @@ -227,7 +227,7 @@ */ typedef struct { u_int32_t count; - char *text[BSM_MAX_ENV]; + char *text[AUDIT_MAX_ENV]; } au_execenv_t; /* @@ -259,7 +259,7 @@ */ typedef struct { u_int16_t no; - u_int32_t list[BSM_MAX_GROUPS]; + u_int32_t list[AUDIT_MAX_GROUPS]; } au_groups_t; /* ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#51 (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/openbsm/libbsm/bsm_token.c#50 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#51 $ */ #include @@ -309,7 +309,7 @@ au_to_groups(int *groups) { - return (au_to_newgroups(BSM_MAX_GROUPS, groups)); + return (au_to_newgroups(AUDIT_MAX_GROUPS, groups)); } /* @@ -1155,7 +1155,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);