Author: rwatson
Date: Sun Mar 1 23:17:51 2009
New Revision: 189258
URL: http://svn.freebsd.org/changeset/base/189258
Log:
Merge r188313 from head to stable/7:
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.
Modified:
stable/7/sys/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
stable/7/sys/dev/ath/ath_hal/ (props changed)
stable/7/sys/dev/cxgb/ (props changed)
stable/7/sys/security/audit/audit_bsm_klib.c
stable/7/sys/security/audit/audit_private.h
Modified: stable/7/sys/security/audit/audit_bsm_klib.c
==============================================================================
--- stable/7/sys/security/audit/audit_bsm_klib.c Sun Mar 1 22:52:41
2009 (r189257)
+++ stable/7/sys/security/audit/audit_bsm_klib.c Sun Mar 1 23:17:51
2009 (r189258)
@@ -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.
*
@@ -345,7 +345,7 @@ audit_flags_and_error_to_openevent(int o
/*
* Convert a MSGCTL command to a specific event.
*/
-int
+au_event_t
audit_msgctl_to_event(int cmd)
{
@@ -368,7 +368,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)
{
@@ -412,7 +412,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)
{
Modified: stable/7/sys/security/audit/audit_private.h
==============================================================================
--- stable/7/sys/security/audit/audit_private.h Sun Mar 1 22:52:41 2009
(r189257)
+++ stable/7/sys/security/audit/audit_private.h Sun Mar 1 23:17:51 2009
(r189258)
@@ -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
@@ -305,10 +305,10 @@ void au_evclassmap_insert(au_event_t e
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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
