Date: Sat, 10 Jan 2004 21:08:29 -0800 (PST) From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 45106 for review Message-ID: <200401110508.i0B58TEF060807@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=45106 Change 45106 by rwatson@rwatson_paprika on 2004/01/10 21:07:56 More include files: security/audit/audit.h -> sys/audit.h #ifdef KERNEL -> #ifdef _KERNEL Forward declare various tructures used in bsm_token.h to reduce dependencies. Make bsm_token.c compile: fix includes, provide dummy kmem_alloc() and kmem_free() for now. Affected files ... .. //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#4 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#4 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#4 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.h#2 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#4 edit .. //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#2 edit .. //depot/projects/trustedbsd/audit2/sys/sys/audit.h#2 edit .. //depot/projects/trustedbsd/audit2/sys/sys/bsm_token.h#3 edit Differences ... ==== //depot/projects/trustedbsd/audit2/sys/security/audit/audit.c#4 (text+ko) ==== @@ -43,8 +43,8 @@ #include <sys/syscall.h> #include <sys/malloc.h> #include <sys/un.h> +#include <sys/audit.h> -#include <security/audit/audit.h> #include <security/audit/kern_audit.h> #include <security/audit/bsm_klib.h> ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_audit.c#4 (text+ko) ==== @@ -35,12 +35,12 @@ #include <sys/bsm_token.h> #include <sys/bsm_kevents.h> #include <sys/user.h> +#include <sys/audit.h> #include <netinet/in_systm.h> #include <netinet/in.h> #include <netinet/ip.h> -#include <security/audit/audit.h> #include <security/audit/kern_audit.h> #include <security/audit/bsm_klib.h> ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.c#4 (text+ko) ==== @@ -23,14 +23,10 @@ * @APPLE_LICENSE_HEADER_END@ */ -#include <sys/types.h> -#include <sys/vnode.h> -#include <sys/fcntl.h> -#include <sys/filedesc.h> -#include <sys/sem.h> +#include <sys/param.h> +#include <sys/audit.h> #include <sys/bsm_kevents.h> -#include <security/audit/audit.h> #include <security/audit/kern_audit.h> #include <security/audit/bsm_klib.h> ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_klib.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ #define AU_PRS_FAILURE 2 #define AU_PRS_BOTH (AU_PRS_SUCCESS|AU_PRS_FAILURE) -#ifdef KERNEL +#ifdef _KERNEL int au_preselect(au_event_t event, au_mask_t *mask_p, int sorf); au_event_t flags_to_openevent(int oflags); void fill_vattr(struct vattr *v, struct vnode_au_info *vn_info); @@ -41,6 +41,6 @@ extern au_event_t sys_au_event[]; extern int nsys_au_event; /* number of entries in this table */ -#endif /*KERNEL*/ +#endif /*_KERNEL*/ #endif /* ! _BSM_KLIB_H_ */ ==== //depot/projects/trustedbsd/audit2/sys/security/audit/bsm_token.c#4 (text+ko) ==== @@ -22,11 +22,22 @@ * * @APPLE_LICENSE_HEADER_END@ */ -#include <sys/types.h> + +#include <sys/param.h> +#include <sys/audit.h> #include <sys/bsm_token.h> +#include <sys/ipc.h> +#include <sys/libkern.h> +#include <sys/socket.h> #include <sys/un.h> +#include <sys/vnode.h> -#include <security/audit/audit.h> +#include <netinet/in.h> +#include <netinet/in_systm.h> +#include <netinet/ip.h> + +#define kmem_alloc(map, ptrref, size) +#define kmem_free(map, ptr, size) #define GET_TOKEN_AREA(tok, dptr, length) \ do {\ ==== //depot/projects/trustedbsd/audit2/sys/security/audit/kern_audit.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ #ifndef _SYS_KERN_AUDIT_H #define _SYS_KERN_AUDIT_H -#ifdef KERNEL +#ifdef _KERNEL /* * Audit subsystem condition flags. The audit_enabled flag is set and @@ -283,6 +283,6 @@ #endif /* AUDIT */ -#endif /* KERNEL */ +#endif /* _KERNEL */ #endif /* !_SYS_KERN_AUDIT_H */ ==== //depot/projects/trustedbsd/audit2/sys/sys/audit.h#2 (text+ko) ==== @@ -187,7 +187,7 @@ }; typedef struct au_record au_record_t; -#ifndef KERNEL +#ifndef _KERNEL __BEGIN_DECLS int audit (const void *, int); @@ -201,6 +201,6 @@ int getaudit_addr (struct auditinfo_addr *, int); int setaudit_addr (const struct auditinfo_addr *, int); __END_DECLS -#endif /* !KERNEL */ +#endif /* !_KERNEL */ #endif /* !_SYS_AUDIT_H */ ==== //depot/projects/trustedbsd/audit2/sys/sys/bsm_token.h#3 (text+ko) ==== @@ -26,6 +26,16 @@ #ifndef _BSM_TOKEN_H_ #define _BSM_TOKEN_H_ +struct vattr; +struct in_addr; +struct in6_addr; +struct ip; +struct ipc_perm; +struct socket; +struct sockaddr_in; +struct sockaddr_in6; +struct sockaddr_un; + /* We could determined the header and trailer sizes by * defining appropriate structures. We hold off that approach * till we have a consistant way of using structures for all tokens.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200401110508.i0B58TEF060807>