From owner-p4-projects@FreeBSD.ORG Mon Oct 3 09:18:14 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 3A80F16A421; Mon, 3 Oct 2005 09:18:14 +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 E81CC16A41F for ; Mon, 3 Oct 2005 09:18:13 +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 A52FD43D48 for ; Mon, 3 Oct 2005 09:18:13 +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 j939IDkZ057428 for ; Mon, 3 Oct 2005 09:18:13 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 j939IDNZ057425 for perforce@freebsd.org; Mon, 3 Oct 2005 09:18:13 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 3 Oct 2005 09:18:13 GMT Message-Id: <200510030918.j939IDNZ057425@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 84704 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: Mon, 03 Oct 2005 09:18:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=84704 Change 84704 by rwatson@rwatson_zoo on 2005/10/03 09:17:48 Integrate OpenBSM branch into TrustedBSD audit3 branch: - Style fixes. - New events, event cleanup. - More event descriptions. Affected files ... .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#3 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#8 integrate .. //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#2 integrate Differences ... ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit.h#3 (text+ko) ==== @@ -289,16 +289,15 @@ typedef struct au_evclass_map au_evclass_map_t; #if !defined(_KERNEL) && !defined(KERNEL) - -int audit (const void *, int); -int auditon (int, void *, int); -int auditctl (const char *); -int getauid (au_id_t *); -int setauid (const au_id_t *); -int getaudit (struct auditinfo *); -int setaudit (const struct auditinfo *); -int getaudit_addr (struct auditinfo_addr *, int); -int setaudit_addr (const struct auditinfo_addr *, int); +int audit(const void *, int); +int auditon(int, void *, int); +int auditctl(const char *); +int getauid(au_id_t *); +int setauid(const au_id_t *); +int getaudit(struct auditinfo *); +int setaudit(const struct auditinfo *); +int getaudit_addr(struct auditinfo_addr *, int); +int setaudit_addr(const struct auditinfo_addr *, int); #endif /* defined(_KERNEL) || defined(KERNEL) */ __END_DECLS ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/bsm/audit_kevents.h#8 (text+ko) ==== @@ -33,7 +33,8 @@ #define AUE_EXIT 1 #define AUE_FORK 2 #define AUE_OPEN 3 -#define AUE_O_CREAT AUE_OPEN_RWTC +#define AUE_CREAT 4 +#define AUE_O_CREAT AUE_CREAT #define AUE_LINK 5 #define AUE_UNLINK 6 #define AUE_DELETE AUE_UNLINK @@ -47,12 +48,12 @@ #define AUE_ACCESS 14 #define AUE_CHECKUSERACCESS AUE_ACCESS #define AUE_KILL 15 -#define AUE_O_KILLPG AUE_KILL #define AUE_STAT 16 #define AUE_O_STAT AUE_STAT #define AUE_LSTAT 17 #define AUE_O_LSTAT AUE_LSTAT #define AUE_ACCT 18 +#define AUE_SOLARIS_REBOOT 20 /* XXX: Darwin conflict. */ #define AUE_SYMLINK 21 #define AUE_READLINK 22 #define AUE_EXECVE 23 @@ -61,17 +62,27 @@ #define AUE_SETGROUPS 26 #define AUE_SETPGRP 27 #define AUE_SWAPON 28 +#define AUE_SOLARIS_SETHOSTNAME 29 /* XXX: Darwin conflict. */ #define AUE_FCNTL 30 +#define AUE_SOLARIS_SETPRIORITY 31 /* XXX: Darwin conflict. */ #define AUE_CONNECT 32 #define AUE_ACCEPT 33 #define AUE_O_ACCEPT AUE_ACCEPT #define AUE_BIND 34 #define AUE_SETSOCKOPT 35 +#define AUE_VTRACE 36 /* Solaris-specific. */ +#define AUE_SOLARIS_SETTIMEOFDAY 37 /* XXX: Darwin conflict. */ #define AUE_FCHOWN 38 #define AUE_FCHMOD 39 +/* XXX: #define AUE_SYSINFO 39 */ #define AUE_SETREUID 40 +#define AUE_O_SETREUID AUE_SETREUID #define AUE_SETREGID 41 +#define AUE_O_SETREGID AUE_SETREGID #define AUE_RENAME 42 +#define AUE_SOLARIS_TRUNCATE 43 /* XXX: Darwin conflict. */ +#define AUE_SOLARIS_FTRUNCATE 44 /* XXX: Darwin conflict. */ +#define AUE_SOLARIS_FLOCK 45 /* XXX: Darwin conflict. */ #define AUE_SHUTDOWN 46 #define AUE_MKDIR 47 #define AUE_RMDIR 48 @@ -79,14 +90,29 @@ #define AUE_ADJTIME 50 #define AUE_SETRLIMIT 51 #define AUE_O_SETRLIMIT AUE_SETRLIMIT +#define AUE_KILLPG 52 +#define AUE_O_KILLPG AUE_KILLPG +#define AUE_SOLARIS_NFS_SVC 53 /* XXX: Darwin conflict. */ #define AUE_STATFS 54 #define AUE_FSTATFS 55 +#define AUE_SOLARIS_UNMOUNT 56 /* XXX: Darwin conflict. */ +#define AUE_ASYNC_DAEMON 57 +#define AUE_NFS_GETFH 58 /* XXX: Darwin conflict. */ +#define AUE_SOLARIS_SETDOMAINNAME 59 /* XXX: Darwin conflict. */ +#define AUE_O_SETDOMAINNAME AUE_SYSCTL +#define AUE_SOLARIS_QUOTACTL 60 /* XXX: Darwin conflict. */ +#define AUE_EXPORTFS 61 +#define AUE_O_EXPORTFS AUE_EXPORTFS #define AUE_MOUNT 62 #define AUE_O_MOUNT AUE_MOUNT +#define AUE_SEMSYS 63 #define AUE_MSGSYS 64 #define AUE_SHMSYS 65 +#define AUE_BSMSYS 66 /* Solaris-specific. */ +#define AUE_RFSSYS 67 /* Solaris-specific. */ #define AUE_FCHDIR 68 #define AUE_FCHROOT 69 +#define AUE_VPIXSYS 70 /* Solaris-specific. */ #define AUE_PATHCONF 71 #define AUE_OPEN_R 72 #define AUE_OPEN_RC 73 @@ -130,6 +156,10 @@ #define AUE_CORE 111 #define AUE_CLOSE 112 #define AUE_SYSTEMBOOT 113 +#define AUE_ASYNC_DAEMON_EXIT 114 /* Solaris-only. */ +#define AUE_NFSSVC_EXIT 115 /* Solaris-only. */ +#define AUE_WRITEL 128 /* Solaris-only. */ +#define AUE_WRITEVL 129 /* Solaris-only. */ #define AUE_GETAUID 130 #define AUE_SETAUID 131 #define AUE_GETAUDIT 132 @@ -229,22 +259,22 @@ #define AUE_PROFILE 305 #define AUE_KTRACE 306 #define AUE_SETLOGIN 307 -#define AUE_REBOOT 308 +#define AUE_REBOOT 308 /* XXX: See AUE_SOLARIS_REBOOT. */ #define AUE_REVOKE 309 #define AUE_UMASK 310 #define AUE_MPROTECT 311 -#define AUE_SETPRIORITY 312 -#define AUE_SETTIMEOFDAY 313 -#define AUE_FLOCK 314 +#define AUE_SETPRIORITY 312 /* XXX: See AUE_SOLARIS_SETPRIORITY. */ +#define AUE_SETTIMEOFDAY 313 /* XXX: See AUE_SOLARIS_SETTIMEOFDAY. */ +#define AUE_FLOCK 314 /* XXX: See AUE_SOLARIS_FLOCK. */ #define AUE_MKFIFO 315 #define AUE_POLL 316 #define AUE_SOCKETPAIR 317 #define AUE_FUTIMES 318 #define AUE_SETSID 319 #define AUE_SETPRIVEXEC 320 -#define AUE_NFSSVC 321 -#define AUE_GETFH 322 -#define AUE_QUOTACTL 323 +#define AUE_NFSSVC 321 /* XXX: See AUE_SOLARIS_NFS_SVC. */ +#define AUE_GETFH 322 /* XXX: See AUE_SOLARIS_NFS_GETFH. */ +#define AUE_QUOTACTL 323 /* XXX: See AUE_SOLARIS_QUOTACTL. */ #define AUE_ADDPROFILE 324 #define AUE_KDBUGTRACE 325 #define AUE_FSTAT 326 @@ -252,13 +282,12 @@ #define AUE_FPATHCONF 327 #define AUE_GETDIRENTRIES 328 #define AUE_O_GETDIRENTRIES AUE_GETDIRENTRIES -#define AUE_TRUNCATE 329 +#define AUE_TRUNCATE 329 /* XXX: See AUE_SOLARIS_TRUNCATE. */ #define AUE_O_TRUNCATE AUE_TRUNCATE -#define AUE_FTRUNCATE 330 +#define AUE_FTRUNCATE 330 /* XXX: See AUE_SOLARIS_FTRUNCATE. */ #define AUE_O_FTRUNCATE AUE_FTRUNCATE #define AUE_SYSCTL 331 -#define AUE_O_SETDOMAINNAME AUE_SYSCTL -#define AUE_O_SETHOSTNAME AUE_SYSCTL +#define AUE_O_SETHOSTNAME AUE_SYSCTL /* XXX: See AUE_SOLARIS_SET.. */ #define AUE_MLOCK 332 #define AUE_MUNLOCK 333 #define AUE_UNDELETE 334 @@ -303,6 +332,9 @@ #define AUE_FHOPEN 373 /* FreeBSD */ #define AUE_FHSTAT 374 /* FreeBSD */ #define AUE_JAIL 375 /* FreeBSD */ +#define AUE_EACCESS 376 /* FreeBSD */ +#define AUE_KQUEUE 377 /* FreeBSD */ +#define AUE_KEVENT 378 /* FreeBSD */ /* * XXXRW: Values not yet assigned. @@ -349,7 +381,6 @@ #define AUE_MUNLOCKALL AUE_NULL #define AUE_O_ASYNCDAEMON AUE_NULL #define AUE_O_EXECV AUE_NULL -#define AUE_O_EXPORTFS AUE_NULL #define AUE_O_GETDENTS AUE_NULL #define AUE_O_GETDOMAINNAME AUE_NULL #define AUE_O_GETDOPT AUE_NULL @@ -364,8 +395,6 @@ #define AUE_O_SETDOPT AUE_NULL #define AUE_O_SETHOSTID AUE_NULL #define AUE_O_SETQUOTA AUE_NULL -#define AUE_O_SETREGID AUE_NULL -#define AUE_O_SETREUID AUE_NULL #define AUE_O_SIGBLOCK AUE_NULL #define AUE_O_SIGSETMASK AUE_NULL #define AUE_O_SIGSTACK AUE_NULL @@ -388,7 +417,6 @@ #define AUE_SEMGETVALUE AUE_NULL #define AUE_SEMINIT AUE_NULL #define AUE_SEMPOST AUE_NULL -#define AUE_SEMSYS AUE_NULL #define AUE_SEMTRYWAIT AUE_NULL #define AUE_SEMWAIT AUE_NULL #define AUE_SETITIMER AUE_NULL ==== //depot/projects/trustedbsd/audit3/contrib/openbsm/etc/audit_event#2 (text+ko) ==== @@ -169,7 +169,6 @@ 205:AUE_SETGID:old setgid(2):pc 206:AUE_READL:readl(2):no 207:AUE_READVL:readvl(2):no -208:AUE_FSTAT:fstat(2):fa 209:AUE_DUP2:dup2(2):no 210:AUE_MMAP:mmap(2):fa 211:AUE_AUDIT:audit(2):ot @@ -284,6 +283,20 @@ 359:AUE_PIDFORTASK:pid_for_task():pc 360:AUE_SYSCTL_NONADMIN:sysctl() - non-admin:ot 361:AUE_COPYFILE:copyfile():fr,fw +362:AUE_LUTIMES:lutimes(2):fm +363:AUE_LCHFLAGS:lchflags(2):fm +364:AUE_SENDFILE:sendfile(2):nt +365:AUE_USELIB:uselib(2):fa +366:AUE_GETRESUID:getresuid(2):pc +367:AUE_SETRESUID:setresuid(2):pc +368:AUE_GETRESGID:getresgid(2):pc +369:AUE_SETRESGID:setresgid(2):pc +370:AUE_WAIT4:wait4(2):pc +371:AUE_LGETFH:lgetfh(2):fa +372:AUE_FHSTATFS:fhstatfs(2):fa +373:AUE_FHOPEN:fhopen(2):fa +374:AUE_FHSTAT:fhstat(2):fa +375:AUE_JAIL:jail(2):pc 6152:AUE_login:login - local:lo 6153:AUE_logout:logout - local:lo 6159:AUE_su:su(1):lo