From owner-p4-projects@FreeBSD.ORG Thu Jun 30 10:50:34 2005 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 17B6D16A420; Thu, 30 Jun 2005 10:50:34 +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 E55F116A41C for ; Thu, 30 Jun 2005 10:50:33 +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 C6EC543D49 for ; Thu, 30 Jun 2005 10:50:33 +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 j5UAoXuV012902 for ; Thu, 30 Jun 2005 10:50:33 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 j5UAoXJ1012898 for perforce@freebsd.org; Thu, 30 Jun 2005 10:50:33 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 30 Jun 2005 10:50:33 GMT Message-Id: <200506301050.j5UAoXJ1012898@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 79285 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, 30 Jun 2005 10:50:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=79285 Change 79285 by rwatson@rwatson_zoo on 2005/06/30 10:50:29 Sort several AUE_O_foo event types to the non-_O versions, and alias them rather than defining them as _NULL. In some cases, if the original is _NULL, alias to the original anyway. Crib values for msgsys(), shmsys(), read(), lseek(), write(), writev(), readv(), and dup2() from Solaris. Affected files ... .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#10 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#10 (text+ko) ==== @@ -43,6 +43,7 @@ #define AUE_CHMOD 10 #define AUE_CHOWN 11 #define AUE_UMOUNT 12 +#define AUE_O_UMOUNT AUE_UMOUNT #define AUE_ACCESS 14 #define AUE_CHECKUSERACCESS AUE_ACCESS #define AUE_KILL 15 @@ -63,6 +64,7 @@ #define AUE_FCNTL 30 #define AUE_CONNECT 32 #define AUE_ACCEPT 33 +#define AUE_O_ACCEPT AUE_ACCEPT #define AUE_BIND 34 #define AUE_SETSOCKOPT 35 #define AUE_FCHOWN 38 @@ -79,6 +81,9 @@ #define AUE_STATFS 54 #define AUE_FSTATFS 55 #define AUE_MOUNT 62 +#define AUE_O_MOUNT AUE_MOUNT +#define AUE_MSGSYS 64 +#define AUE_SHMSYS 65 #define AUE_FCHDIR 68 #define AUE_FCHROOT 69 #define AUE_PATHCONF 71 @@ -149,11 +154,18 @@ #define AUE_O_RECVMSG AUE_RECVMSG #define AUE_RECVFROM 191 #define AUE_O_RECVFROM AUE_RECVFROM +#define AUE_READ 192 +#define AUE_LSEEK 194 +#define AUE_O_LSEEK AUE_LSEEK +#define AUE_WRITE 195 +#define AUE_WRITEV 196 +#define AUE_READV 198 #define AUE_SETUID 200 #define AUE_STIME 201 #define AUE_UTIME 202 #define AUE_NICE 203 #define AUE_SETGID 205 +#define AUE_DUP2 209 #define AUE_MMAP 210 #define AUE_O_MMAP AUE_MMAP #define AUE_AUDIT 211 @@ -282,7 +294,6 @@ * XXXRW: Values not yet assigned. */ #define AUE_DUP AUE_NULL -#define AUE_DUP2 AUE_NULL #define AUE_FSCTL AUE_NULL #define AUE_FSTATV AUE_NULL #define AUE_FSYNC AUE_NULL @@ -295,22 +306,24 @@ #define AUE_GETITIMER AUE_NULL #define AUE_GETLOGIN AUE_NULL #define AUE_GETPEERNAME AUE_NULL +#define AUE_O_GETPEERNAME AUE_GETPEERNAME #define AUE_GETPGID AUE_NULL #define AUE_GETPGRP AUE_NULL #define AUE_GETPID AUE_NULL #define AUE_GETPPID AUE_NULL #define AUE_GETPRIORITY AUE_NULL #define AUE_GETRLIMIT AUE_NULL +#define AUE_O_GETRLIMIT AUE_GETRLIMIT #define AUE_GETRUSAGE AUE_NULL #define AUE_GETSID AUE_NULL #define AUE_GETSOCKNAME AUE_NULL +#define AUE_O_GETSOCKNAME AUE_GETSOCKNAME #define AUE_GETTIMEOFDAY AUE_NULL #define AUE_GETUID AUE_NULL #define AUE_GETSOCKOPT AUE_NULL #define AUE_GTSOCKOPT AUE_GETSOCKOPT #define AUE_ISSETUGID AUE_NULL #define AUE_LISTEN AUE_NULL -#define AUE_LSEEK AUE_NULL #define AUE_LSTATV AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL @@ -318,10 +331,8 @@ #define AUE_MLOCKALL AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL -#define AUE_MSGSYS AUE_NULL #define AUE_MSYNC AUE_NULL #define AUE_MUNLOCKALL AUE_NULL -#define AUE_O_ACCEPT AUE_NULL #define AUE_O_ASYNCDAEMON AUE_NULL #define AUE_O_EXECV AUE_NULL #define AUE_O_EXPORTFS AUE_NULL @@ -331,11 +342,6 @@ #define AUE_O_GETHOSTID AUE_NULL #define AUE_O_GETHOSTNAME AUE_NULL #define AUE_O_GETPAGESIZE AUE_NULL -#define AUE_O_GETPEERNAME AUE_NULL -#define AUE_O_GETRLIMIT AUE_NULL -#define AUE_O_GETSOCKNAME AUE_NULL -#define AUE_O_LSEEK AUE_NULL -#define AUE_O_MOUNT AUE_NULL #define AUE_O_PCFS_MOUNT AUE_NULL #define AUE_O_QUOTA AUE_NULL #define AUE_O_RESUBA AUE_NULL @@ -350,7 +356,6 @@ #define AUE_O_SIGSETMASK AUE_NULL #define AUE_O_SIGSTACK AUE_NULL #define AUE_O_SIGVEC AUE_NULL -#define AUE_O_UMOUNT AUE_NULL #define AUE_O_USTATE AUE_NULL #define AUE_O_VADVISE AUE_NULL #define AUE_O_VHANGUP AUE_NULL @@ -363,8 +368,6 @@ #define AUE_O_WAIT3 AUE_NULL #define AUE_PREAD AUE_NULL #define AUE_PWRITE AUE_NULL -#define AUE_READ AUE_NULL -#define AUE_READV AUE_NULL #define AUE_SBRK AUE_NULL #define AUE_SELECT AUE_NULL #define AUE_SEMDESTROY AUE_NULL @@ -375,7 +378,6 @@ #define AUE_SEMTRYWAIT AUE_NULL #define AUE_SEMWAIT AUE_NULL #define AUE_SETITIMER AUE_NULL -#define AUE_SHMSYS AUE_NULL #define AUE_SIGACTION AUE_NULL #define AUE_SIGALTSTACK AUE_NULL #define AUE_SIGPENDING AUE_NULL @@ -390,8 +392,6 @@ #define AUE_TABLE AUE_NULL #define AUE_WAITEVENT AUE_NULL #define AUE_WATCHEVENT AUE_NULL -#define AUE_WRITE AUE_NULL -#define AUE_WRITEV AUE_NULL #define AU_WAIT4 AUE_NULL #endif /* !_BSM_AUDIT_KEVENTS_H_ */