From 54613833523e04a1367f05bbaf9311f5c5042db7 Mon Sep 17 00:00:00 2001 From: rwatson Date: Sat, 1 Mar 2008 11:40:49 +0000 Subject: Add audit_prefixes to two more globally visible functions in the Audit implementation. MFC after: 1 month --- sys/security/audit/audit.c | 4 ++-- sys/security/audit/audit_bsm_klib.c | 4 ++-- sys/security/audit/audit_private.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'sys') diff --git a/sys/security/audit/audit.c b/sys/security/audit/audit.c index 00b753e..b60d4f7 100644 --- a/sys/security/audit/audit.c +++ b/sys/security/audit/audit.c @@ -361,12 +361,12 @@ audit_commit(struct kaudit_record *ar, int error, int retval) * change it to the proper type of event based on the flags * and the error value. */ - ar->k_ar.ar_event = flags_and_error_to_openevent( + ar->k_ar.ar_event = audit_flags_and_error_to_openevent( ar->k_ar.ar_arg_fflags, error); break; case AUE_SYSCTL: - ar->k_ar.ar_event = ctlname_to_sysctlevent( + ar->k_ar.ar_event = audit_ctlname_to_sysctlevent( ar->k_ar.ar_arg_ctlname, ar->k_ar.ar_valid_arg); break; diff --git a/sys/security/audit/audit_bsm_klib.c b/sys/security/audit/audit_bsm_klib.c index f4d28dd..02702f4 100644 --- a/sys/security/audit/audit_bsm_klib.c +++ b/sys/security/audit/audit_bsm_klib.c @@ -180,7 +180,7 @@ au_preselect(au_event_t event, au_class_t class, au_mask_t *mask_p, int sorf) * Convert sysctl names and present arguments to events. */ au_event_t -ctlname_to_sysctlevent(int name[], uint64_t valid_arg) +audit_ctlname_to_sysctlevent(int name[], uint64_t valid_arg) { /* can't parse it - so return the worst case */ @@ -242,7 +242,7 @@ ctlname_to_sysctlevent(int name[], uint64_t valid_arg) * auditing purposes. */ au_event_t -flags_and_error_to_openevent(int oflags, int error) +audit_flags_and_error_to_openevent(int oflags, int error) { au_event_t aevent; diff --git a/sys/security/audit/audit_private.h b/sys/security/audit/audit_private.h index 2dd3437..556e37e 100644 --- a/sys/security/audit/audit_private.h +++ b/sys/security/audit/audit_private.h @@ -300,15 +300,15 @@ token_t *kau_to_socket(struct socket_au_info *soi); */ int au_preselect(au_event_t event, au_class_t class, au_mask_t *mask_p, int sorf); -au_event_t flags_and_error_to_openevent(int oflags, int error); void au_evclassmap_init(void); 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 ctlname_to_sysctlevent(int name[], uint64_t valid_arg); -int auditon_command_event(int cmd); +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); void audit_canon_path(struct thread *td, char *path, char *cpath); +int auditon_command_event(int cmd); /* * Audit trigger events notify user space of kernel audit conditions -- cgit v1.1