Date: Sat, 10 Jan 2004 19:56:59 -0800 (PST) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 45100 for review Message-ID: <200401110356.i0B3uxmP038795@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=45100 Change 45100 by rwatson@rwatson_paprika on 2004/01/10 19:56:31 Kernel-internal include files in slightly different places on FreeBSD. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#2 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#2 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#2 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#2 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#2 (text+ko) ==== @@ -35,11 +35,11 @@ #include <sys/uio.h> #include <sys/unistd.h> #include <sys/vnode.h> -#include <sys/audit.h> -#include <sys/kern_audit.h> +#include <security/audit/audit.h> +#include <security/audit/kern_audit.h> #include <sys/user.h> #include <sys/bsm_kevents.h> -#include <sys/bsm_klib.h> +#include <security/audit/bsm_klib.h> #include <sys/syscall.h> #include <sys/malloc.h> #include <sys/un.h> @@ -62,6 +62,7 @@ #define AUDIT_PRINTF(X) #endif +#if 0 #if DIAGNOSTIC #if defined(assert) #undef assert() @@ -71,6 +72,8 @@ #else #include <kern/assert.h> #endif /* DIAGNOSTIC */ +#endif +#define assert KASSERT /* * Define the audit control flags. ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#2 (text+ko) ==== @@ -30,11 +30,11 @@ #include <sys/socket.h> #include <sys/queue.h> #include <sys/fcntl.h> -#include <sys/audit.h> -#include <sys/kern_audit.h> +#include <security/audit/audit.h> +#include <security/audit/kern_audit.h> #include <sys/bsm_token.h> #include <sys/bsm_kevents.h> -#include <sys/bsm_klib.h> +#include <security/audit/bsm_klib.h> #include <sys/user.h> #include <netinet/in_systm.h> #include <netinet/in.h> ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#2 (text+ko) ==== @@ -28,8 +28,8 @@ #include <sys/fcntl.h> #include <sys/filedesc.h> #include <sys/sem.h> -#include <sys/audit.h> -#include <sys/kern_audit.h> +#include <security/audit/audit.h> +#include <security/audit/kern_audit.h> #include <sys/bsm_kevents.h> #include <sys/bsm_klib.h> ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/types.h> #include <sys/bsm_token.h> -#include <sys/audit.h> +#include <security/audit/audit.h> #include <sys/un.h> #include <kern/clock.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401110356.i0B3uxmP038795>