Date: Mon, 2 May 2005 23:29:53 GMT From: Wayne Salamon <wsalamon@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 76394 for review Message-ID: <200505022329.j42NTrgG085616@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=76394 Change 76394 by wsalamon@rickenbacker on 2005/05/02 23:29:28 Cleanup of test cases: remove redundant includes; rework the includes to match the current BSM installation scheme. Affected files ... .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tchroot.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tdir.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileaccess.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfilecreate.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileioctl.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfilemodify.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tmmap.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tsharedfile.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/include/audittest.h#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tipc.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tmsg.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tposix.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tsem.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tshm.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/syscall/tsysaudit.c#3 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/system/tadmin.c#2 edit .. //depot/projects/trustedbsd/audit3/tools/regression/audit/test/system/tsysctl.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tchroot.c#3 (text+ko) ==== @@ -28,7 +28,6 @@ #include <audittest.h> #include <dirent.h> #include <fcntl.h> -#include <bsm/audit.h> #include <sys/stat.h> #include <sys/syscall.h> #include <sys/types.h> ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tdir.c#3 (text+ko) ==== @@ -28,7 +28,6 @@ #include <audittest.h> #include <dirent.h> #include <fcntl.h> -#include <bsm/audit.h> #include <sys/stat.h> #include <sys/syscall.h> #include <sys/types.h> ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileaccess.c#3 (text+ko) ==== @@ -27,8 +27,6 @@ */ #include <audittest.h> #include <fcntl.h> -#include <bsm/audit.h> -#include <bsm/audit_record.h> #include <sys/mount.h> #include <sys/stat.h> #include <sys/syscall.h> ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfilecreate.c#3 (text+ko) ==== @@ -27,8 +27,6 @@ */ #include <audittest.h> #include <fcntl.h> -#include <bsm/audit.h> -#include <bsm/audit_record.h> #include <sys/stat.h> #include <sys/syscall.h> #include <sys/types.h> ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfileioctl.c#3 (text+ko) ==== @@ -26,7 +26,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <audittest.h> -#include <bsm/audit.h> #include <sys/filio.h> #include <sys/syscall.h> ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tfilemodify.c#3 (text+ko) ==== @@ -27,8 +27,6 @@ */ #include <audittest.h> #include <fcntl.h> -#include <bsm/audit.h> -#include <bsm/audit_record.h> #include <sys/stat.h> #include <sys/syscall.h> #include <sys/types.h> ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tmmap.c#3 (text+ko) ==== @@ -27,7 +27,6 @@ */ #include <audittest.h> #include <fcntl.h> -#include <bsm/audit.h> #include <sys/mman.h> #include <sys/syscall.h> ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/file/tsharedfile.c#3 (text+ko) ==== @@ -26,8 +26,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <audittest.h> -#include <bsm/audit.h> -#include <bsm/audit_record.h> #include <sys/syscall.h> /* ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/include/audittest.h#3 (text+ko) ==== @@ -25,11 +25,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include <bsm/audit_kevents.h> +#include <sys/param.h> + +#include <libbsm.h> #include <assert.h> #include <stdio.h> #include <stdbool.h> -#include <bsm/audit.h> -#include <bsm/audit_kevents.h> #define AUDITLOGSUFFIX "audit.log" #define INITIAL_AUID 666 ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tipc.c#3 (text+ko) ==== @@ -26,7 +26,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <audittest.h> -#include <bsm/audit.h> #include <sys/syscall.h> /* ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tmsg.c#3 (text+ko) ==== @@ -26,7 +26,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <audittest.h> -#include <bsm/audit.h> #include <sys/ipc.h> #include <sys/syscall.h> #include <sys/types.h> ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tposix.c#3 (text+ko) ==== @@ -28,7 +28,6 @@ #include <audittest.h> #include <fcntl.h> #include <semaphore.h> -#include <bsm/audit.h> #include <sys/mman.h> #include <sys/stat.h> #include <sys/syscall.h> ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tsem.c#3 (text+ko) ==== @@ -26,7 +26,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <audittest.h> -#include <bsm/audit.h> #include <sys/ipc.h> #include <sys/sem.h> #include <sys/syscall.h> ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/ipc/tshm.c#3 (text+ko) ==== @@ -26,7 +26,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <audittest.h> -#include <bsm/audit.h> #include <sys/ipc.h> #include <sys/shm.h> #include <sys/syscall.h> ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/syscall/tsysaudit.c#3 (text+ko) ==== @@ -27,8 +27,6 @@ */ #include <audittest.h> #include <fcntl.h> -#include <bsm/audit.h> -#include <bsm/libbsm.h> #include <sys/types.h> /* ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/system/tadmin.c#2 (text+ko) ==== @@ -25,14 +25,13 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include <audittest.h> #include <sys/syscall.h> #include <sys/types.h> #include <sys/time.h> -#include <sys/quota.h> #include <sys/resource.h> -#include <sys/audit.h> #include <sys/reboot.h> -#include <audittest.h> +#include <ufs/ufs/quota.h> /* * Test the auditing of some of the admin-related system calls. ==== //depot/projects/trustedbsd/audit3/tools/regression/audit/test/system/tsysctl.c#2 (text+ko) ==== @@ -25,12 +25,11 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ +#include <audittest.h> #include <sys/syscall.h> #include <sys/types.h> #include <sys/sysctl.h> -#include <sys/audit.h> #include <netinet/in.h> -#include <audittest.h> /* * Test the auditing of some of the sysctl() system call.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505022329.j42NTrgG085616>