d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update src/sys/security/audit for OpenBSM 1.0 alpha 5:

Browse Source 
- Include audit_internal.h to get definition of internal audit record
  structures, as it's no longer in audit.h.  Forward declare au_record
  in audit_private.h as not all audit_private.h consumers care about
  it.

- Remove __APPLE__ compatibility bits that are subsumed by configure
  for user space.

- Don't expose in6_addr internals (non-portable, but also cleaner
  looking).

- Avoid nested include of audit.h in audit_private.h.

Obtained from:	TrustedBSD Project
This commit is contained in:
rwatson 2006-03-04 17:00:55 +00:00
parent d39e49362c
commit 20bce94704
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/security/audit/audit.c
View File

@ -58,6 +58,7 @@
#include <sys/vnode.h>
#include <bsm/audit.h>
#include <bsm/audit_internal.h>
#include <bsm/audit_kevents.h>
#include <netinet/in.h>

18
sys/security/audit/audit_bsm_token.c
View File

@ -30,16 +30,12 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
* $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#7 $
* $P4: //depot/projects/trustedbsd/audit3/sys/security/audit/audit_bsm_token.c#9 $
* $FreeBSD$
*/
#include <sys/types.h>
#ifdef __APPLE__
#include <compat/endian.h>
#else /* !__APPLE__ */
#include <sys/endian.h>
#endif /* __APPLE__*/
#include <sys/socket.h>
#include <sys/time.h>
@ -327,10 +323,7 @@ au_to_in_addr_ex(struct in6_addr *internet_addr)
ADD_U_CHAR(dptr, AUT_IN_ADDR_EX);
ADD_U_INT32(dptr, type);
ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[0]);
ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[1]);
ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[2]);
ADD_U_INT32(dptr, internet_addr->__u6_addr.__u6_addr32[3]);
ADD_MEM(dptr, internet_addr, sizeof(*internet_addr));
return (t);
}
@ -865,10 +858,7 @@ au_to_sock_inet128(struct sockaddr_in6 *so)
ADD_U_CHAR(dptr, so->sin6_family);
ADD_U_INT16(dptr, so->sin6_port);
ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[0]);
ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[1]);
ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[2]);
ADD_U_INT32(dptr, so->sin6_addr.__u6_addr.__u6_addr32[3]);
ADD_MEM(dptr, &so->sin6_addr, sizeof(so->sin6_addr));
return (t);
@ -992,7 +982,7 @@ au_to_subject_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
tid));
}
#if !defined(_KERNEL) && !defined(KERNEL)
#if !defined(_KERNEL) && !defined(KERNEL) && defined(HAVE_AUDIT_SYSCALLS)
/*
* Collects audit information for the current process
* and creates a subject token from it

2
sys/security/audit/audit_private.h
View File

@ -233,6 +233,7 @@ struct kaudit_record *audit_new(int event, struct thread *td);
* Functions relating to the conversion of internal kernel audit records to
* the BSM file format.
*/
struct au_record;
int kaudit_to_bsm(struct kaudit_record *kar,
struct au_record **pau);
int bsm_rec_verify(void *rec);
@ -259,7 +260,6 @@ void kau_init(void);
#include <sys/fcntl.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <security/audit/audit.h>
/*
* Some of the BSM tokenizer functions take different parameters in the