summaryrefslogtreecommitdiffstats
path: root/sys/bsm
diff options
context:
space:
mode:
Diffstat (limited to 'sys/bsm')
-rw-r--r--sys/bsm/audit.h25
-rw-r--r--sys/bsm/audit_internal.h28
2 files changed, 31 insertions, 22 deletions
diff --git a/sys/bsm/audit.h b/sys/bsm/audit.h
index 2522116..b21b951 100644
--- a/sys/bsm/audit.h
+++ b/sys/bsm/audit.h
@@ -30,7 +30,7 @@
*
* @APPLE_BSD_LICENSE_HEADER_END@
*
- * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#22 $
+ * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit.h#24 $
* $FreeBSD$
*/
@@ -258,25 +258,11 @@ struct auditpinfo_addr {
};
typedef struct auditpinfo_addr auditpinfo_addr_t;
-/* Token and record structures. */
-
-struct au_token {
- u_char *t_data;
- size_t len;
- TAILQ_ENTRY(au_token) tokens;
-};
+/*
+ * Contents of token_t are opaque outside of libbsm.
+ */
typedef struct au_token token_t;
-struct au_record {
- char used; /* Record currently in use? */
- int desc; /* Descriptor for record. */
- TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */
- u_char *data;
- size_t len;
- LIST_ENTRY(au_record) au_rec_q;
-};
-typedef struct au_record au_record_t;
-
/*
* Kernel audit queue control parameters.
*/
@@ -328,6 +314,9 @@ struct au_evclass_map {
};
typedef struct au_evclass_map au_evclass_map_t;
+/*
+ * Audit system calls.
+ */
#if !defined(_KERNEL) && !defined(KERNEL)
int audit(const void *, int);
int auditon(int, void *, int);
diff --git a/sys/bsm/audit_internal.h b/sys/bsm/audit_internal.h
index 17d056b..54767b9 100644
--- a/sys/bsm/audit_internal.h
+++ b/sys/bsm/audit_internal.h
@@ -34,12 +34,16 @@
*
* @APPLE_BSD_LICENSE_HEADER_END@
*
- * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#5 $
+ * $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#7 $
* $FreeBSD$
*/
-#ifndef _LIBBSM_INTERNAL_H
-#define _LIBBSM_INTERNAL_H
+#ifndef _AUDIT_INTERNAL_H
+#define _AUDIT_INTERNAL_H
+
+#if defined(__linux__) && !defined(__unused)
+#define __unused
+#endif
/*
* audit_internal.h contains private interfaces that are shared by user space
@@ -48,6 +52,22 @@
* broken with future releases of OpenBSM, which may delete, modify, or
* otherwise break these interfaces or the assumptions they rely on.
*/
+struct au_token {
+ u_char *t_data;
+ size_t len;
+ TAILQ_ENTRY(au_token) tokens;
+};
+
+struct au_record {
+ char used; /* Record currently in use? */
+ int desc; /* Descriptor for record. */
+ TAILQ_HEAD(, au_token) token_q; /* Queue of BSM tokens. */
+ u_char *data;
+ size_t len;
+ LIST_ENTRY(au_record) au_rec_q;
+};
+typedef struct au_record au_record_t;
+
/* We could determined the header and trailer sizes by
* defining appropriate structures. We hold off that approach
@@ -97,4 +117,4 @@
#define ADD_STRING(loc, data, size) ADD_MEM(loc, data, size)
-#endif /* !_LIBBSM_INTERNAL_H_ */
+#endif /* !_AUDIT_INTERNAL_H_ */
OpenPOWER on IntegriCloud