From owner-p4-projects@FreeBSD.ORG Fri Jun 17 01:08:55 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 1596116A420; Fri, 17 Jun 2005 01:08:55 +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 D1BD916A41C for ; Fri, 17 Jun 2005 01:08:54 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BC72C43D48 for ; Fri, 17 Jun 2005 01:08:54 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5H18sJl075491 for ; Fri, 17 Jun 2005 01:08:54 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5H18sqq075488 for perforce@freebsd.org; Fri, 17 Jun 2005 01:08:54 GMT (envelope-from wsalamon@computer.org) Date: Fri, 17 Jun 2005 01:08:54 GMT Message-Id: <200506170108.j5H18sqq075488@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to wsalamon@computer.org using -f From: Wayne Salamon To: Perforce Change Reviews Cc: Subject: PERFORCE change 78653 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: Fri, 17 Jun 2005 01:08:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=78653 Change 78653 by wsalamon@rickenbacker on 2005/06/17 01:08:00 Change the auditctl() prototype back to match that in Darwin, where only the audit log filename can be passed in. Some other manner will be used to send triggers in non-Mach systems. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#14 edit .. //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#21 edit .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#11 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#7 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#14 (text+ko) ==== @@ -659,6 +659,6 @@ *auditinfo_addr, u_int length); } 452 AUE_SETAUDIT_ADDR MSTD { int setaudit_addr(struct auditinfo_addr \ *auditinfo_addr, u_int length); } -453 AUE_AUDITCTL MSTD { int auditctl(int cmd, void *data, u_int length); } +453 AUE_AUDITCTL MSTD { int auditctl(char *path); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/audit3/sys/security/audit/kern_audit.c#21 (text+ko) ==== ==== //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#11 (text+ko) ==== ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#7 (text+ko) ==== @@ -149,13 +149,6 @@ #define AU_FS_MINFREE 20 /* default min filesystem freespace, in percent */ -/* - * auditctl(2) commands - */ -#define AC_SETLOGFILE 1 -#define AC_SHUTDOWN 2 -#define AC_SENDTRIGGER 3 - __BEGIN_DECLS typedef uid_t au_id_t; @@ -291,7 +284,7 @@ int audit (const void *, int); int auditon (int, void *, int); -int auditctl (int, const void *, u_int); +int auditctl (const char *); int getauid (au_id_t *); int setauid (const au_id_t *); int getaudit (struct auditinfo *);