Page MenuHomeFreeBSD
Files F156518767

D15561.id42952.diff
No OneTemporary
Actions

D15561.id42952.diff
View Options

Index: sys/bsm/audit.h
===================================================================
--- sys/bsm/audit.h
+++ sys/bsm/audit.h
@@ -253,14 +253,14 @@
/*
* Kernel audit queue control parameters:
* Default: Maximum:
- * aq_hiwater: AQ_HIWATER (100) AQ_MAXHIGH (10000)
+ * aq_hiwater: AQ_HIWATER (100) AQ_MAXHIGH (10000)
* aq_lowater: AQ_LOWATER (10) <aq_hiwater
* aq_bufsz: AQ_BUFSZ (32767) AQ_MAXBUFSZ (1048576)
- * aq_delay: 20 20000 (not used)
+ * aq_delay: 20 20000 (not used)
*/
struct au_qctrl {
int aq_hiwater; /* Max # of audit recs in queue when */
- /* threads with new ARs get blocked. */
+ /* threads with new ARs get blocked. */
int aq_lowater; /* # of audit recs in queue when */
/* blocked threads get unblocked. */
@@ -321,6 +321,17 @@
typedef struct au_evname_map au_evname_map_t;
/*
+ * Data structures used for complex ioctl arguments. Do not change existing
+ * structures, add new revised ones to be used by new ioctls, and keep the
+ * old structures and ioctls for backwards compatibility.
+ */
+struct auditpipe_ioctl_preselect {
+ au_id_t aip_auid; /* auid of the preselection parameters */
+ au_mask_t aip_mask; /* audit mask of the parameters */
+};
+typedef struct auditpipe_ioctl_preselect auditpipe_ioctl_preselect_t;
+
+/*
* Audit system calls.
*/
#if !defined(_KERNEL) && !defined(KERNEL)
Index: sys/security/audit/audit_ioctl.h
===================================================================
--- sys/security/audit/audit_ioctl.h
+++ sys/security/audit/audit_ioctl.h
@@ -31,17 +31,9 @@
#ifndef _SECURITY_AUDIT_AUDIT_IOCTL_H_
#define _SECURITY_AUDIT_AUDIT_IOCTL_H_
-#define AUDITPIPE_IOBASE 'A'
+#include <bsm/audit.h>
-/*
- * Data structures used for complex ioctl arguments. Do not change existing
- * structures, add new revised ones to be used by new ioctls, and keep the
- * old structures and ioctls for backwards compatibility.
- */
-struct auditpipe_ioctl_preselect {
- au_id_t aip_auid;
- au_mask_t aip_mask;
-};
+#define AUDITPIPE_IOBASE 'A'
/*
* Possible modes of operation for audit pipe preselection.
@@ -62,9 +54,9 @@
#define AUDITPIPE_GET_PRESELECT_NAFLAGS _IOR(AUDITPIPE_IOBASE, 8, au_mask_t)
#define AUDITPIPE_SET_PRESELECT_NAFLAGS _IOW(AUDITPIPE_IOBASE, 9, au_mask_t)
#define AUDITPIPE_GET_PRESELECT_AUID _IOR(AUDITPIPE_IOBASE, 10, \
- struct auditpipe_ioctl_preselect)
+ auditpipe_ioctl_preselect_t)
#define AUDITPIPE_SET_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 11, \
- struct auditpipe_ioctl_preselect)
+ auditpipe_ioctl_preselect_t)
#define AUDITPIPE_DELETE_PRESELECT_AUID _IOW(AUDITPIPE_IOBASE, 12, au_id_t)
#define AUDITPIPE_FLUSH_PRESELECT_AUID _IO(AUDITPIPE_IOBASE, 13)
#define AUDITPIPE_GET_PRESELECT_MODE _IOR(AUDITPIPE_IOBASE, 14, int)

File Metadata

Mime Type
text/plain
Expires
Fri, May 15, 8:43 AM (2 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33078328
Default Alt Text
D15561.id42952.diff (2 KB)

Event Timeline