From owner-p4-projects@FreeBSD.ORG Sat Feb 4 00:51:28 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 A832616A423; Sat, 4 Feb 2006 00:51:27 +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 6C6C716A420 for ; Sat, 4 Feb 2006 00:51:27 +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 2D7E043D45 for ; Sat, 4 Feb 2006 00:51:27 +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 k140pRGj058647 for ; Sat, 4 Feb 2006 00:51:27 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 k140pQNY058644 for perforce@freebsd.org; Sat, 4 Feb 2006 00:51:26 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Sat, 4 Feb 2006 00:51:26 GMT Message-Id: <200602040051.k140pQNY058644@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 91017 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: Sat, 04 Feb 2006 00:51:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=91017 Change 91017 by rwatson@rwatson_peppercorn on 2006/02/04 00:50:42 Merge man page fixes, removal of tfm class, additional audit event types for FreeBSD (etc) from TrustedBSD OpenBSM branch to TrustedBSD audit3 branch. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#15 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#4 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#4 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#15 (text+ko) ==== @@ -30,7 +30,7 @@ * * @APPLE_BSD_LICENSE_HEADER_END@ * - * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#14 $ + * $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#15 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -358,7 +358,33 @@ #define AUE_KQUEUE 377 /* FreeBSD-specific. */ #define AUE_KEVENT 378 /* FreeBSD-specific. */ #define AUE_FSYNC 379 -#define AUE_NMOUNT 380 /* FreeBSD-specific. */ +#define AUE_NMOUNT 380 /* FreeBSD-specific. */ +#define AUE_BDFLUSH 381 /* Linux-specific. */ +#define AUE_SETFSUID 382 /* Linux-specific. */ +#define AUE_GETFSUID 383 /* Linux-specific. */ +#define AUE_PERSONALITY 384 /* Linux-specific. */ +#define AUE_SCHED_GETSCHEDULER 385 /* POSIX.1b. */ +#define AUE_SCHED_SETSCHEDULER 386 /* POSIX.1b. */ +#define AUE_PRCTL 387 /* Linux-specific. */ +#define AUE_GETCWD 388 /* FreeBSD/Linux-specific. */ +#define AUE_CAPGET 389 /* Linux-specific. */ +#define AUE_CAPSET 390 /* Linux-specific. */ +#define AUE_PIVOT_ROOT 391 /* Linux-specific. */ +#define AUE_RTPRIO 392 /* FreeBSD-specific. */ +#define AUE_SCHED_GETPARAM 393 /* POSIX.1b. */ +#define AUE_SCHED_GETPARAM 394 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MAX 395 /* POSIX.1b. */ +#define AUE_SCHED_GET_PRIORITY_MIN 396 /* POSIX.1b. */ +#define AUE_SCHED_RR_GET_INTERVAL 397 /* POSIX.1b. */ +#define AUE_ACL_GET_FILE 398 /* FreeBSD. */ +#define AUE_ACL_SET_FILE 399 /* FreeBSD. */ +#define AUE_ACL_GET_FD 400 /* FreeBSD. */ +#define AUE_ACL_SET_FD 401 /* FreeBSD. */ +#define AUE_ACL_DELETE_FILE 402 /* FreeBSD. */ +#define AUE_ACL_DELETE_FD 403 /* FreeBSD. */ +#define AUE_ACL_CHECK_FILE 404 /* FreeBSD. */ +#define AUE_ACL_CHECK_FD 405 /* FreeBSD. */ + /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -467,6 +493,8 @@ #define AUE_MUNLOCKALL AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL +#define AUE_PREADV AUE_NULL +#define AUE_PWRITEV AUE_NULL #define AUE_SBRK AUE_NULL #define AUE_SELECT AUE_NULL #define AUE_SEMDESTROY AUE_NULL ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#3 $ +# $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_class#4 $ # # This file must match audit.h # @@ -17,7 +17,6 @@ 0x00000400:na:non attributable 0x00000800:ad:administrative 0x00001000:lo:login_logout -0x00002000:tf:tfm 0x00004000:ap:application 0x20000000:io:ioctl 0x40000000:ex:exec ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#4 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#3 $ +.\" $P4: //depot/projects/trustedbsd/audit3/contrib/openbsm/man/audit.log.5#4 $ .\" .Dd May 1, 2005 .Dt AUDIT.LOG 5 @@ -304,7 +304,8 @@ .It Li "Terminal Machine Address" Ta "4 bytes" Ta "IP address of machine" .El .Ss Expanded Process Token -The .Dv expanded process +The +.Dv expanded process token contains the contents of the .Dv process token, with the addition of a machine address type and variable length @@ -411,7 +412,8 @@ .Bl -column -offset ind ".Sy Field Name Width XX" ".Sy XX Bytes XXXX" ".Sy Description" .It Sy "Field" Ta Sy Bytes Ta Sy Description .It Li "Token ID" Ta "1 byte" Ta "Token ID" -.It Li XXXXX +.It Li "object ID type" Ta "1 byte" Ta "Object ID" +.It Li "Object ID" Ta "4 bytes" Ta "Object ID" .El .Ss Text Token The @@ -591,6 +593,7 @@ .It Li XXXXX .El .Sh SEE ALSO +.Xr audit 8, .Xr libbsm 3 .Sh AUTHORS The Basic Security Module (BSM) interface to audit records and audit event