From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 18:49:53 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 203DB16A420 for ; Mon, 27 Feb 2006 18:49:53 +0000 (GMT) (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 8214143D64 for ; Mon, 27 Feb 2006 18:49:37 +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 63F9E46BAF for ; Mon, 27 Feb 2006 13:49:17 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 570E45BA6B; Mon, 27 Feb 2006 18:49:13 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EF2716A425; Mon, 27 Feb 2006 18:49:13 +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 EE0C416A422 for ; Mon, 27 Feb 2006 18:49:12 +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 A32BB43D55 for ; Mon, 27 Feb 2006 18:49:05 +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 k1RIn5TU032932 for ; Mon, 27 Feb 2006 18:49:05 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 k1RIn5hb032929 for perforce@freebsd.org; Mon, 27 Feb 2006 18:49:05 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 18:49:05 GMT Message-Id: <200602271849.k1RIn5hb032929@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 92473 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: Mon, 27 Feb 2006 18:49:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=92473 Change 92473 by rwatson@rwatson_fledge on 2006/02/27 18:48:09 Move contents of struct au_token from audit.h to audit_internal.h: this is internal to the libbsm implementation. Leave token_t in the public header since it is a defined part of the interface. Move contents of struct au_record and definition of au_record_t into audit_internal.h for similar reasons. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#14 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#15 $ */ #ifndef _BSM_AUDIT_H @@ -240,25 +240,11 @@ }; typedef struct auditpinfo_addr auditpinfo_addr_t; -/* Token and record structures. */ - -struct au_token { - u_char *t_data; - size_t len; - TAILQ_ENTRY(au_token) tokens; -}; +/* + * Contents of token_t are opaque outside of libbsm. + */ typedef struct au_token token_t; -struct au_record { - char used; /* Record currently in use? */ - int desc; /* Descriptor for record. */ - TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ - u_char *data; - size_t len; - LIST_ENTRY(au_record) au_rec_q; -}; -typedef struct au_record au_record_t; - /* * Kernel audit queue control parameters. */ @@ -310,6 +296,9 @@ }; typedef struct au_evclass_map au_evclass_map_t; +/* + * Audit system calls. + */ #if !defined(_KERNEL) && !defined(KERNEL) int audit(const void *, int); int auditon(int, void *, int); ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 (text+ko) ==== @@ -34,7 +34,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#8 $ */ #ifndef _LIBBSM_INTERNAL_H @@ -47,6 +47,22 @@ * broken with future releases of OpenBSM, which may delete, modify, or * otherwise break these interfaces or the assumptions they rely on. */ +struct au_token { + u_char *t_data; + size_t len; + TAILQ_ENTRY(au_token) tokens; +}; + +struct au_record { + char used; /* Record currently in use? */ + int desc; /* Descriptor for record. */ + TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */ + u_char *data; + size_t len; + LIST_ENTRY(au_record) au_rec_q; +}; +typedef struct au_record au_record_t; + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach