summaryrefslogtreecommitdiffstats
path: root/sys/bsm/audit_record.h
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2009-01-14 10:44:16 +0000
committerrwatson <rwatson@FreeBSD.org>2009-01-14 10:44:16 +0000
commitdecd722669c40502553396eefd1098657c2eac59 (patch)
tree475d9112fa7258dc14e742448d0a7ccbc27a17ab /sys/bsm/audit_record.h
parentf2dfb737c38eea614a85b0eefc92a363a91d9143 (diff)
parent77fa2b3194a06888941bfb26e7aa568742d4150a (diff)
downloadFreeBSD-src-decd722669c40502553396eefd1098657c2eac59.zip
FreeBSD-src-decd722669c40502553396eefd1098657c2eac59.tar.gz
Merge OpenBSM alpha 5 from OpenBSM vendor branch to head, both
contrib/openbsm (svn merge) and src/sys/{bsm,security/audit} (manual merge). Hook up bsm_domain.c and bsm_socket_type.c to the libbsm build along with man pages, add audit_bsm_domain.c and audit_bsm_socket_type.c to the kernel environment. OpenBSM history for imported revisions below for reference. MFC after: 1 month Sponsored by: Apple Inc. Obtained from: TrustedBSD Project OpenBSM 1.1 alpha 5 - Stub libauditd(3) man page added. - All BSM error number constants with BSM_ERRNO_. - Interfaces to convert between local and BSM socket types and protocol families have been added: au_bsm_to_domain(3), au_bsm_to_socket_type(3), au_domain_to_bsm(3), and au_socket_type_to_bsm(3), along with definitions of constants in audit_domain.h and audit_socket_type.h. This improves interoperability by converting local constant spaces, which vary by OS, to and from Solaris constants (where available) or OpenBSM constants for protocol domains not present in Solaris (a fair number). These routines should be used when generating and interpreting extended socket tokens. - Fix build warnings with full gcc warnings enabled on most supported platforms. - Don't compile error strings into bsm_errno.c when building it in the kernel environment. - When started by launchd, use the label com.apple.auditd rather than org.trustedbsd.auditd.
Diffstat (limited to 'sys/bsm/audit_record.h')
-rw-r--r--sys/bsm/audit_record.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/bsm/audit_record.h b/sys/bsm/audit_record.h
index 2bb78bc..5d9306a 100644
--- a/sys/bsm/audit_record.h
+++ b/sys/bsm/audit_record.h
@@ -26,7 +26,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#3
+ * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_record.h#9
* $FreeBSD$
*/
@@ -282,10 +282,15 @@ token_t *au_to_trailer(int rec_size);
token_t *au_to_zonename(const char *zonename);
/*
- * BSM library routines for manipulating errno values.
+ * BSM library routines for converting between local and BSM constant spaces.
*/
+int au_bsm_to_domain(u_short bsm_domain, int *local_domainp);
int au_bsm_to_errno(u_char bsm_error, int *errorp);
-u_char au_errno_to_bsm(int error);
+int au_bsm_to_socket_type(u_short bsm_socket_type,
+ int *local_socket_typep);
+u_short au_domain_to_bsm(int local_domain);
+u_char au_errno_to_bsm(int local_errno);
+u_short au_socket_type_to_bsm(int local_socket_type);
__END_DECLS
OpenPOWER on IntegriCloud