From owner-p4-projects@FreeBSD.ORG Thu Jan 15 07:47:48 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8F19316A4D0; Thu, 15 Jan 2004 07:47:48 -0800 (PST) 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 63F1D16A4CE for ; Thu, 15 Jan 2004 07:47:48 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 52F3943D5D for ; Thu, 15 Jan 2004 07:47:30 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i0FFlU0B089992 for ; Thu, 15 Jan 2004 07:47:30 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i0FFlTNM089989 for perforce@freebsd.org; Thu, 15 Jan 2004 07:47:29 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Thu, 15 Jan 2004 07:47:29 -0800 (PST) Message-Id: <200401151547.i0FFlTNM089989@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 Subject: PERFORCE change 45389 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: Thu, 15 Jan 2004 15:47:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=45389 Change 45389 by rwatson@rwatson_tislabs on 2004/01/15 07:47:02 Switch audit system calls to MNOSTD as we want to be able to compile the kernel without Audit support without stubs. Also, we may want to make Audit a module. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#6 edit .. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#6 edit .. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#6 edit .. //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#6 edit .. //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#6 edit .. //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#6 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#6 (text+ko) ==== @@ -469,14 +469,14 @@ { AS(extattr_list_file_args), (sy_call_t *)extattr_list_file }, /* 438 = extattr_list_file */ { AS(extattr_list_link_args), (sy_call_t *)extattr_list_link }, /* 439 = extattr_list_link */ { SYF_MPSAFE | AS(kse_switchin_args), (sy_call_t *)kse_switchin }, /* 440 = kse_switchin */ - { SYF_MPSAFE | AS(audit_args), (sy_call_t *)audit }, /* 441 = audit */ - { SYF_MPSAFE | AS(auditon_args), (sy_call_t *)auditon }, /* 442 = auditon */ - { SYF_MPSAFE | AS(auditsvc_args), (sy_call_t *)auditsvc }, /* 443 = auditsvc */ - { SYF_MPSAFE | AS(getauid_args), (sy_call_t *)getauid }, /* 444 = getauid */ - { SYF_MPSAFE | AS(setauid_args), (sy_call_t *)setauid }, /* 445 = setauid */ - { SYF_MPSAFE | AS(getaudit_args), (sy_call_t *)getaudit }, /* 446 = getaudit */ - { SYF_MPSAFE | AS(setaudit_args), (sy_call_t *)setaudit }, /* 447 = setaudit */ - { SYF_MPSAFE | AS(getaudit_addr_args), (sy_call_t *)getaudit_addr }, /* 448 = getaudit_addr */ - { SYF_MPSAFE | AS(setaudit_addr_args), (sy_call_t *)setaudit_addr }, /* 449 = setaudit_addr */ - { SYF_MPSAFE | AS(auditctl_args), (sy_call_t *)auditctl }, /* 450 = auditctl */ + { SYF_MPSAFE | AS(audit_args), (sy_call_t *)lkmressys }, /* 441 = audit */ + { SYF_MPSAFE | AS(auditon_args), (sy_call_t *)lkmressys }, /* 442 = auditon */ + { SYF_MPSAFE | AS(auditsvc_args), (sy_call_t *)lkmressys }, /* 443 = auditsvc */ + { SYF_MPSAFE | AS(getauid_args), (sy_call_t *)lkmressys }, /* 444 = getauid */ + { SYF_MPSAFE | AS(setauid_args), (sy_call_t *)lkmressys }, /* 445 = setauid */ + { SYF_MPSAFE | AS(getaudit_args), (sy_call_t *)lkmressys }, /* 446 = getaudit */ + { SYF_MPSAFE | AS(setaudit_args), (sy_call_t *)lkmressys }, /* 447 = setaudit */ + { SYF_MPSAFE | AS(getaudit_addr_args), (sy_call_t *)lkmressys }, /* 448 = getaudit_addr */ + { SYF_MPSAFE | AS(setaudit_addr_args), (sy_call_t *)lkmressys }, /* 449 = setaudit_addr */ + { SYF_MPSAFE | AS(auditctl_args), (sy_call_t *)lkmressys }, /* 450 = auditctl */ }; ==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#6 (text+ko) ==== ==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#6 (text+ko) ==== @@ -627,17 +627,17 @@ int attrnamespace, void *data, size_t nbytes); } 440 MSTD { int kse_switchin(const struct __mcontext *mcp, \ long val, long *loc); } -441 MSTD { int audit(const void *record, u_int length); } -442 MSTD { int auditon(int cmd, void *data, u_int length); } -443 MSTD { int auditsvc(int fd, int limit); } -444 MSTD { int getauid(uid_t *auid); } -445 MSTD { int setauid(uid_t *auid); } -446 MSTD { int getaudit(struct auditinfo *auditinfo); } -447 MSTD { int setaudit(struct auditinfo *auditinfo); } -448 MSTD { int getaudit_addr(struct auditinfo_addr \ +441 MNOSTD { int audit(const void *record, u_int length); } +442 MNOSTD { int auditon(int cmd, void *data, u_int length); } +443 MNOSTD { int auditsvc(int fd, int limit); } +444 MNOSTD { int getauid(uid_t *auid); } +445 MNOSTD { int setauid(uid_t *auid); } +446 MNOSTD { int getaudit(struct auditinfo *auditinfo); } +447 MNOSTD { int setaudit(struct auditinfo *auditinfo); } +448 MNOSTD { int getaudit_addr(struct auditinfo_addr \ *auditinfo_addr, u_int length); } -449 MSTD { int setaudit_addr(struct auditinfo_addr \ +449 MNOSTD { int setaudit_addr(struct auditinfo_addr \ *auditinfo_addr, u_int length); } -450 MSTD { int auditctl(char *path); } +450 MNOSTD { int auditctl(char *path); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#6 (text+ko) ==== ==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#6 (text+ko) ==== ==== //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#6 (text+ko) ====