Date: Sun, 18 Jan 2004 20:18:26 -0800 (PST) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 45577 for review Message-ID: <200401190418.i0J4IQs8078875@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=45577 Change 45577 by rwatson@rwatson_tislabs on 2004/01/18 20:17:42 Do include stubs for audit system calls in the !AUDIT case. Don't include unnecessary audit stubs for !AUDIT case. Audit cannot currently be loaded as a module, it must be compiled in. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/conf/files#5 edit .. //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#7 edit .. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#7 edit .. //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#7 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#16 edit .. //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#7 edit .. //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#7 edit .. //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#7 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/conf/files#5 (text+ko) ==== @@ -1616,7 +1616,7 @@ posix4/p1003_1b.c standard posix4/posix4_mib.c standard kern/uipc_sem.c optional p1003_1b_semaphores -security/audit/audit.c optional audit +security/audit/audit.c standard security/audit/bsm_audit.c optional audit security/audit/bsm_klib.c optional audit security/audit/bsm_token.c optional audit ==== //depot/projects/trustedbsd/audit2/sys/kern/init_sysent.c#7 (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 *)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 */ + { 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 */ }; ==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.c#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit2/sys/kern/syscalls.master#7 (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 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 \ +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 \ *auditinfo_addr, u_int length); } -449 MNOSTD { int setaudit_addr(struct auditinfo_addr \ +449 MSTD { int setaudit_addr(struct auditinfo_addr \ *auditinfo_addr, u_int length); } -450 MNOSTD { int auditctl(char *path); } +450 MSTD { 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/security/audit/audit.c#16 (text+ko) ==== @@ -1566,22 +1566,4 @@ return (ENOSYS); } -void -audit_proc_init(struct proc *p) -{ - -} - -void -audit_proc_fork(struct proc *parent, struct proc *child) -{ - -} - -void -audit_proc_free(struct proc *p) -{ - -} - #endif /* AUDIT */ ==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.h#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit2/sys/sys/syscall.mk#7 (text+ko) ==== ==== //depot/projects/trustedbsd/audit2/sys/sys/sysproto.h#7 (text+ko) ====
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401190418.i0J4IQs8078875>