aboutsummaryrefslogtreecommitdiff
path: root/sys/bsm
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2009-07-17 12:18:39 +0000
committerRobert Watson <rwatson@FreeBSD.org>2009-07-17 12:18:39 +0000
commit5d171016e7ded77bb3a5eaff82d036a250f515bb (patch)
tree30581f591ebe8df4491b7d6e479a866065aee118 /sys/bsm
parenta751bb747008d2d65523ad2bb7693437b6a3d185 (diff)
downloadsrc-5d171016e7ded77bb3a5eaff82d036a250f515bb.tar.gz
src-5d171016e7ded77bb3a5eaff82d036a250f515bb.zip
Vendor import of OpenBSM 1.1p1, which incorporates the following changesvendor/openbsm/1.1-P-1
since the last imported OpenBSM release: OpenBSM 1.1p1 - Fixes to AUT_SOCKUNIX token parsing. - IPv6 support for au_to_me(3). - Improved robustness in the parsing of audit_control, especially long flags/naflags strings and whitespace in all fields. - Add missing conversion of a number of FreeBSD/Mac OS X errnos to/from BSM error number space. Obtained from: TrustedBSD Project Sponsored by: Apple, Inc.
Notes
Notes: svn path=/vendor/openbsm/dist/; revision=195738 svn path=/vendor/openbsm/1.1-P-1/; revision=195739; tag=vendor/openbsm/1.1-P-1
Diffstat (limited to 'sys/bsm')
-rw-r--r--sys/bsm/audit.h7
-rw-r--r--sys/bsm/audit_kevents.h3
2 files changed, 6 insertions, 4 deletions
diff --git a/sys/bsm/audit.h b/sys/bsm/audit.h
index 2a1abe853b2d..bb4a9497b64e 100644
--- a/sys/bsm/audit.h
+++ b/sys/bsm/audit.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.h#9 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#10 $
*/
#ifndef _BSM_AUDIT_H
@@ -172,6 +172,7 @@ typedef pid_t au_asid_t;
typedef u_int16_t au_event_t;
typedef u_int16_t au_emod_t;
typedef u_int32_t au_class_t;
+typedef u_int64_t au_asflgs_t __attribute__ ((aligned (8)));
struct au_tid {
dev_t port;
@@ -205,7 +206,7 @@ struct auditinfo_addr {
au_mask_t ai_mask; /* Audit masks. */
au_tid_addr_t ai_termid; /* Terminal ID. */
au_asid_t ai_asid; /* Audit session ID. */
- u_int64_t ai_flags; /* Audit session flags. */
+ au_asflgs_t ai_flags; /* Audit session flags. */
};
typedef struct auditinfo_addr auditinfo_addr_t;
@@ -224,7 +225,7 @@ struct auditpinfo_addr {
au_mask_t ap_mask; /* Audit masks. */
au_tid_addr_t ap_termid; /* Terminal ID. */
au_asid_t ap_asid; /* Audit session ID. */
- u_int64_t ap_flags; /* Audit session flags. */
+ au_asflgs_t ap_flags; /* Audit session flags. */
};
typedef struct auditpinfo_addr auditpinfo_addr_t;
diff --git a/sys/bsm/audit_kevents.h b/sys/bsm/audit_kevents.h
index 268c456c3b05..9ef255361c25 100644
--- a/sys/bsm/audit_kevents.h
+++ b/sys/bsm/audit_kevents.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_kevents.h#6 $
+ * $P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#8 $
*/
#ifndef _BSM_AUDIT_KEVENTS_H_
@@ -596,6 +596,7 @@
#define AUE_PWRITE 43193 /* Darwin/FreeBSD. */
#define AUE_FSCTL 43194 /* Darwin. */
#define AUE_FFSCTL 43195 /* Darwin. */
+#define AUE_LPATHCONF 43196 /* FreeBSD. */
/*
* Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the