Change various routines that are responsible for transforming audit

event IDs based on arguments to return au_event_t rather than int.

Obtained from:	TrustedBSD Project
Sponsored by:	Apple, Inc.
MFC after:	1 week

2 files changed, 8 insertions, 8 deletions

diff --git a/sys/security/audit/audit_bsm_klib.c b/sys/security/audit/audit_bsm_klib.c
index a75a68b..547e09a 100644
--- a/sys/security/audit/audit_bsm_klib.c
+++ b/sys/security/audit/audit_bsm_klib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2008 Apple Inc.
+ * Copyright (c) 1999-2009 Apple Inc.
  * Copyright (c) 2005 Robert N. M. Watson
  * All rights reserved.
  *
@@ -346,7 +346,7 @@ audit_flags_and_error_to_openevent(int oflags, int error)
 /*
  * Convert a MSGCTL command to a specific event.
  */
-int
+au_event_t
 audit_msgctl_to_event(int cmd)
 {
 
@@ -369,7 +369,7 @@ audit_msgctl_to_event(int cmd)
 /*
  * Convert a SEMCTL command to a specific event.
  */
-int
+au_event_t
 audit_semctl_to_event(int cmd)
 {
 
@@ -413,7 +413,7 @@ audit_semctl_to_event(int cmd)
 /*
  * Convert a command for the auditon() system call to a audit event.
  */
-int
+au_event_t
 auditon_command_event(int cmd)
 {
 
diff --git a/sys/security/audit/audit_private.h b/sys/security/audit/audit_private.h
index b79d966..ec5beb5 100644
--- a/sys/security/audit/audit_private.h
+++ b/sys/security/audit/audit_private.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 1999-2005 Apple Inc.
+ * Copyright (c) 1999-2009 Apple Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -306,10 +306,10 @@ void		 au_evclassmap_insert(au_event_t event, au_class_t class);
 au_class_t	 au_event_class(au_event_t event);
 au_event_t	 audit_ctlname_to_sysctlevent(int name[], uint64_t valid_arg);
 au_event_t	 audit_flags_and_error_to_openevent(int oflags, int error);
-int		 audit_msgctl_to_event(int cmd);
-int		 audit_semctl_to_event(int cmr);
+au_event_t	 audit_msgctl_to_event(int cmd);
+au_event_t	 audit_semctl_to_event(int cmr);
 void		 audit_canon_path(struct thread *td, char *path, char *cpath);
-int		 auditon_command_event(int cmd);
+au_event_t	 auditon_command_event(int cmd);
 
 /*
  * Audit trigger events notify user space of kernel audit conditions