From owner-p4-projects@FreeBSD.ORG Wed Jul 14 01:02:34 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0CB4D16A4D0; Wed, 14 Jul 2004 01:02:34 +0000 (GMT) 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 DCB9E16A4CE for ; Wed, 14 Jul 2004 01:02:33 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D256243D1D for ; Wed, 14 Jul 2004 01:02:33 +0000 (GMT) (envelope-from wsalamon@computer.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i6E12XXc083951 for ; Wed, 14 Jul 2004 01:02:33 GMT (envelope-from wsalamon@computer.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i6E12XX8083948 for perforce@freebsd.org; Wed, 14 Jul 2004 01:02:33 GMT (envelope-from wsalamon@computer.org) Date: Wed, 14 Jul 2004 01:02:33 GMT Message-Id: <200407140102.i6E12XX8083948@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 Subject: PERFORCE change 57309 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: Wed, 14 Jul 2004 01:02:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=57309 Change 57309 by wsalamon@wsalamon_epi on 2004/07/14 01:01:35 Add audit-related system calls. Affected files ... .. //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#2 edit .. //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#2 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.h#2 edit .. //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#2 edit .. //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#3 edit Differences ... ==== //depot/projects/trustedbsd/audit3/sys/kern/init_sysent.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/init_sysent.c,v 1.170 2004/04/05 10:16:38 dfr Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp */ @@ -472,4 +472,13 @@ { SYF_MPSAFE | AS(ksem_timedwait_args), (sy_call_t *)lkmressys }, /* 441 = ksem_timedwait */ { SYF_MPSAFE | AS(thr_suspend_args), (sy_call_t *)thr_suspend }, /* 442 = thr_suspend */ { SYF_MPSAFE | AS(thr_wake_args), (sy_call_t *)thr_wake }, /* 443 = thr_wake */ + { SYF_MPSAFE | AS(audit_args), (sy_call_t *)audit }, /* 444 = audit */ + { SYF_MPSAFE | AS(auditon_args), (sy_call_t *)auditon }, /* 445 = auditon */ + { SYF_MPSAFE | AS(getauid_args), (sy_call_t *)getauid }, /* 446 = getauid */ + { SYF_MPSAFE | AS(setauid_args), (sy_call_t *)setauid }, /* 447 = setauid */ + { SYF_MPSAFE | AS(getaudit_args), (sy_call_t *)getaudit }, /* 448 = getaudit */ + { SYF_MPSAFE | AS(setaudit_args), (sy_call_t *)setaudit }, /* 449 = setaudit */ + { SYF_MPSAFE | AS(getaudit_addr_args), (sy_call_t *)getaudit_addr }, /* 450 = getaudit_addr */ + { SYF_MPSAFE | AS(setaudit_addr_args), (sy_call_t *)setaudit_addr }, /* 451 = setaudit_addr */ + { SYF_MPSAFE | AS(auditctl_args), (sy_call_t *)auditctl }, /* 452 = auditctl */ }; ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/kern/syscalls.c,v 1.156 2004/04/05 10:16:38 dfr Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp */ @@ -451,4 +451,13 @@ "ksem_timedwait", /* 441 = ksem_timedwait */ "thr_suspend", /* 442 = thr_suspend */ "thr_wake", /* 443 = thr_wake */ + "audit", /* 444 = audit */ + "auditon", /* 445 = auditon */ + "getauid", /* 446 = getauid */ + "setauid", /* 447 = setauid */ + "getaudit", /* 448 = getaudit */ + "setaudit", /* 449 = setaudit */ + "getaudit_addr", /* 450 = getaudit_addr */ + "setaudit_addr", /* 451 = setaudit_addr */ + "auditctl", /* 452 = auditctl */ }; ==== //depot/projects/trustedbsd/audit3/sys/kern/syscalls.master#2 (text+ko) ==== @@ -631,5 +631,16 @@ 441 MNOSTD { int ksem_timedwait(semid_t id, struct timespec *abstime); } 442 MSTD { int thr_suspend(const struct timespec *timeout); } 443 MSTD { int thr_wake(thr_id_t id); } +444 MSTD { int audit(const void *record, u_int length); } +445 MSTD { int auditon(int cmd, void *data, u_int length); } +446 MSTD { int getauid(uid_t *auid); } +447 MSTD { int setauid(uid_t *auid); } +448 MSTD { int getaudit(struct auditinfo *auditinfo); } +449 MSTD { int setaudit(struct auditinfo *auditinfo); } +450 MSTD { int getaudit_addr(struct auditinfo_addr \ + *auditinfo_addr, u_int length); } +451 MSTD { int setaudit_addr(struct auditinfo_addr \ + *auditinfo_addr, u_int length); } +452 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/sys/syscall.h#2 (text+ko) ==== @@ -2,7 +2,7 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/syscall.h,v 1.154 2004/04/05 10:16:38 dfr Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp */ @@ -356,4 +356,13 @@ #define SYS_ksem_timedwait 441 #define SYS_thr_suspend 442 #define SYS_thr_wake 443 -#define SYS_MAXSYSCALL 444 +#define SYS_audit 444 +#define SYS_auditon 445 +#define SYS_getauid 446 +#define SYS_setauid 447 +#define SYS_getaudit 448 +#define SYS_setaudit 449 +#define SYS_getaudit_addr 450 +#define SYS_setaudit_addr 451 +#define SYS_auditctl 452 +#define SYS_MAXSYSCALL 453 ==== //depot/projects/trustedbsd/audit3/sys/sys/syscall.mk#2 (text+ko) ==== @@ -1,6 +1,6 @@ # FreeBSD system call names. # DO NOT EDIT-- this file is automatically generated. -# $FreeBSD: src/sys/sys/syscall.mk,v 1.109 2004/04/05 10:16:38 dfr Exp $ +# $FreeBSD$ # created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp MIASM = \ syscall.o \ @@ -297,4 +297,13 @@ kse_switchin.o \ ksem_timedwait.o \ thr_suspend.o \ - thr_wake.o + thr_wake.o \ + audit.o \ + auditon.o \ + getauid.o \ + setauid.o \ + getaudit.o \ + setaudit.o \ + getaudit_addr.o \ + setaudit_addr.o \ + auditctl.o ==== //depot/projects/trustedbsd/audit3/sys/sys/sysproto.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/sys/sysproto.h,v 1.153 2004/04/05 10:16:39 dfr Exp $ + * $FreeBSD$ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.171 2004/04/05 10:15:53 dfr Exp */ @@ -1312,10 +1312,6 @@ char data_l_[PADL_(void *)]; void * data; char data_r_[PADR_(void *)]; char length_l_[PADL_(u_int)]; u_int length; char length_r_[PADR_(u_int)]; }; -struct auditsvc_args { - char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char limit_l_[PADL_(int)]; int limit; char limit_r_[PADR_(int)]; -}; struct getauid_args { char auid_l_[PADL_(uid_t *)]; uid_t * auid; char auid_r_[PADR_(uid_t *)]; }; @@ -1635,7 +1631,6 @@ int thr_wake(struct thread *, struct thr_wake_args *); int audit(struct thread *, struct audit_args *); int auditon(struct thread *, struct auditon_args *); -int auditsvc(struct thread *, struct auditsvc_args *); int getauid(struct thread *, struct getauid_args *); int setauid(struct thread *, struct setauid_args *); int getaudit(struct thread *, struct getaudit_args *);