From owner-p4-projects@FreeBSD.ORG Mon Jan 12 20:48:58 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0113216A4D1; Mon, 12 Jan 2004 20:48:57 -0800 (PST) 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 D0ED516A4CE for ; Mon, 12 Jan 2004 20:48:57 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 919AF43D39 for ; Mon, 12 Jan 2004 20:48:56 -0800 (PST) (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.10/8.12.10) with ESMTP id i0D4mu0B095648 for ; Mon, 12 Jan 2004 20:48:56 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0D4muEu095645 for perforce@freebsd.org; Mon, 12 Jan 2004 20:48:56 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 12 Jan 2004 20:48:56 -0800 (PST) Message-Id: <200401130448.i0D4muEu095645@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 45245 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: Tue, 13 Jan 2004 04:48:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=45245 Change 45245 by rwatson@rwatson_paprika on 2004/01/12 20:48:51 Move in-kernel BSM APIs to audit private include file, to avoid exposing token_t to the remainder of the kernel. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit_private.h#3 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#9 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit_private.h#3 (text+ko) ==== @@ -123,4 +123,21 @@ TAILQ_ENTRY(kaudit_record) k_q; }; +/* + * Kernel versions of the BSM audit record functions. + */ +struct au_record *kau_open(void); +int kau_write(struct au_record *rec, token_t *m); +int kau_close(struct au_record *rec, + struct timespec *endtime, short event); +void kau_free(struct au_record *rec); +void kau_init(void); +token_t *kau_to_file(char *file, struct timeval *tv); +token_t *kau_to_header(struct timespec *ctime, int rec_size, + au_event_t e_type, au_emod_t e_mod); +token_t *kau_to_header32(struct timespec *ctime, int rec_size, + au_event_t e_type, au_emod_t e_mod); +token_t *kau_to_header64(struct timespec *ctime, int rec_size, + au_event_t e_type, au_emod_t e_mod); + #endif /* !_SYS_AUDIT_PRIVATE_H */ ==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#9 (text+ko) ==== @@ -114,22 +114,6 @@ int bsm_rec_verify(caddr_t rec); /* - * Kernel versions of the BSM audit record functions. - */ -struct au_record *kau_open(void); -int kau_write(struct au_record *rec, token_t *m); -int kau_close(struct au_record *rec, - struct timespec *endtime, short event); -void kau_free(struct au_record *rec); -void kau_init(void); -token_t *kau_to_file(char *file, struct timeval *tv); -token_t *kau_to_header(struct timespec *ctime, int rec_size, - au_event_t e_type, au_emod_t e_mod); -token_t *kau_to_header32(struct timespec *ctime, int rec_size, - au_event_t e_type, au_emod_t e_mod); -token_t *kau_to_header64(struct timespec *ctime, int rec_size, - au_event_t e_type, au_emod_t e_mod); -/* * The remaining kernel functions are conditionally compiled in as they * are wrapped by a macro, and the macro should be the only place in * the source tree where these functions are referenced.