PERFORCE change 90639 for review
Robert Watson
rwatson at FreeBSD.org
Sun Jan 29 20:39:42 GMT 2006
http://perforce.freebsd.org/chv.cgi?CH=90639
Change 90639 by rwatson at rwatson_peppercorn on 2006/01/29 20:38:59
style(9).
Affected files ...
.. //depot/projects/trustedbsd/openbsm/bsm/audit.h#14 edit
Differences ...
==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#14 (text+ko) ====
@@ -30,37 +30,37 @@
*
* @APPLE_BSD_LICENSE_HEADER_END@
*
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#13 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#14 $
*/
#ifndef _BSM_AUDIT_H
#define _BSM_AUDIT_H
#define AUDIT_RECORD_MAGIC 0x828a0f1b
-#define MAX_AUDIT_RECORDS 20
-#define MAX_AUDIT_RECORD_SIZE 4096
-#define MIN_AUDIT_FILE_SIZE (512 * 1024)
+#define MAX_AUDIT_RECORDS 20
+#define MAX_AUDIT_RECORD_SIZE 4096
+#define MIN_AUDIT_FILE_SIZE (512 * 1024)
/*
* Triggers for the audit daemon
*/
-#define AUDIT_TRIGGER_MIN 1
-#define AUDIT_TRIGGER_LOW_SPACE 1
-#define AUDIT_TRIGGER_OPEN_NEW 2
-#define AUDIT_TRIGGER_READ_FILE 3
-#define AUDIT_TRIGGER_CLOSE_AND_DIE 4
-#define AUDIT_TRIGGER_NO_SPACE 5
-#define AUDIT_TRIGGER_MAX 5
+#define AUDIT_TRIGGER_MIN 1
+#define AUDIT_TRIGGER_LOW_SPACE 1
+#define AUDIT_TRIGGER_OPEN_NEW 2
+#define AUDIT_TRIGGER_READ_FILE 3
+#define AUDIT_TRIGGER_CLOSE_AND_DIE 4
+#define AUDIT_TRIGGER_NO_SPACE 5
+#define AUDIT_TRIGGER_MAX 5
/*
* File that will be read for trigger events from the kernel
*/
-#define AUDIT_TRIGGER_FILE "/dev/audit"
+#define AUDIT_TRIGGER_FILE "/dev/audit"
/*
* Pre-defined audit IDs
*/
-#define AU_DEFAUDITID -1
+#define AU_DEFAUDITID -1
/*
* Define the masks for the classes of audit events.
@@ -103,71 +103,74 @@
/*
* IPC types
*/
-#define AT_IPC_MSG ((u_char)1) /* message IPC id */
-#define AT_IPC_SEM ((u_char)2) /* semaphore IPC id */
-#define AT_IPC_SHM ((u_char)3) /* shared mem IPC id */
+#define AT_IPC_MSG ((u_char)1) /* Message IPC id. */
+#define AT_IPC_SEM ((u_char)2) /* Semaphore IPC id. */
+#define AT_IPC_SHM ((u_char)3) /* Shared mem IPC id. */
/*
* Audit conditions.
*/
-#define AUC_UNSET 0
-#define AUC_AUDITING 1
-#define AUC_NOAUDIT 2
-#define AUC_DISABLED -1
+#define AUC_UNSET 0
+#define AUC_AUDITING 1
+#define AUC_NOAUDIT 2
+#define AUC_DISABLED -1
/*
* auditon(2) commands.
*/
-#define A_GETPOLICY 2
-#define A_SETPOLICY 3
-#define A_GETKMASK 4
-#define A_SETKMASK 5
+#define A_GETPOLICY 2
+#define A_SETPOLICY 3
+#define A_GETKMASK 4
+#define A_SETKMASK 5
#define A_GETQCTRL 6
-#define A_SETQCTRL 7
-#define A_GETCWD 8
-#define A_GETCAR 9
-#define A_GETSTAT 12
-#define A_SETSTAT 13
+#define A_SETQCTRL 7
+#define A_GETCWD 8
+#define A_GETCAR 9
+#define A_GETSTAT 12
+#define A_SETSTAT 13
#define A_SETUMASK 14
-#define A_SETSMASK 15
-#define A_GETCOND 20
-#define A_SETCOND 21
-#define A_GETCLASS 22
-#define A_SETCLASS 23
-#define A_GETPINFO 24
-#define A_SETPMASK 25
-#define A_SETFSIZE 26
-#define A_GETFSIZE 27
-#define A_GETPINFO_ADDR 28
-#define A_GETKAUDIT 29
-#define A_SETKAUDIT 30
-#define A_SENDTRIGGER 31
+#define A_SETSMASK 15
+#define A_GETCOND 20
+#define A_SETCOND 21
+#define A_GETCLASS 22
+#define A_SETCLASS 23
+#define A_GETPINFO 24
+#define A_SETPMASK 25
+#define A_SETFSIZE 26
+#define A_GETFSIZE 27
+#define A_GETPINFO_ADDR 28
+#define A_GETKAUDIT 29
+#define A_SETKAUDIT 30
+#define A_SENDTRIGGER 31
/*
* Audit policy controls.
*/
-#define AUDIT_CNT 0x0001
-#define AUDIT_AHLT 0x0002
-#define AUDIT_ARGV 0x0004
-#define AUDIT_ARGE 0x0008
-#define AUDIT_PASSWD 0x0010
-#define AUDIT_SEQ 0x0020
-#define AUDIT_WINDATA 0x0040
-#define AUDIT_USER 0x0080
-#define AUDIT_GROUP 0x0100
-#define AUDIT_TRAIL 0x0200
-#define AUDIT_PATH 0x0400
+#define AUDIT_CNT 0x0001
+#define AUDIT_AHLT 0x0002
+#define AUDIT_ARGV 0x0004
+#define AUDIT_ARGE 0x0008
+#define AUDIT_PASSWD 0x0010
+#define AUDIT_SEQ 0x0020
+#define AUDIT_WINDATA 0x0040
+#define AUDIT_USER 0x0080
+#define AUDIT_GROUP 0x0100
+#define AUDIT_TRAIL 0x0200
+#define AUDIT_PATH 0x0400
/*
* Audit queue control parameters
*/
-#define AQ_HIWATER 100
-#define AQ_MAXHIGH 10000
-#define AQ_LOWATER 10
-#define AQ_BUFSZ 1024
-#define AQ_MAXBUFSZ 1048576
+#define AQ_HIWATER 100
+#define AQ_MAXHIGH 10000
+#define AQ_LOWATER 10
+#define AQ_BUFSZ 1024
+#define AQ_MAXBUFSZ 1048576
-#define AU_FS_MINFREE 20 /* default min filesystem freespace, in percent */
+/*
+ * Default minimum percentage free space on file system.
+ */
+#define AU_FS_MINFREE 20
/*
* Type definitions used indicating the length of variable length addresses
@@ -178,83 +181,83 @@
__BEGIN_DECLS
-typedef uid_t au_id_t;
-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 uid_t au_id_t;
+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;
struct au_tid {
- dev_t port;
- u_int32_t machine;
+ dev_t port;
+ u_int32_t machine;
};
-typedef struct au_tid au_tid_t;
+typedef struct au_tid au_tid_t;
struct au_tid_addr {
- dev_t at_port;
- u_int32_t at_type;
- u_int32_t at_addr[4];
+ dev_t at_port;
+ u_int32_t at_type;
+ u_int32_t at_addr[4];
};
-typedef struct au_tid_addr au_tid_addr_t;
+typedef struct au_tid_addr au_tid_addr_t;
struct au_mask {
- unsigned int am_success; /* success bits */
- unsigned int am_failure; /* failure bits */
+ unsigned int am_success; /* Success bits. */
+ unsigned int am_failure; /* Failure bits. */
};
-typedef struct au_mask au_mask_t;
+typedef struct au_mask au_mask_t;
struct auditinfo {
- au_id_t ai_auid; /* Audit user ID */
- au_mask_t ai_mask; /* Audit masks */
- au_tid_t ai_termid; /* Terminal ID */
- au_asid_t ai_asid; /* Audit session ID */
+ au_id_t ai_auid; /* Audit user ID. */
+ au_mask_t ai_mask; /* Audit masks. */
+ au_tid_t ai_termid; /* Terminal ID. */
+ au_asid_t ai_asid; /* Audit session ID. */
};
-typedef struct auditinfo auditinfo_t;
+typedef struct auditinfo auditinfo_t;
struct auditinfo_addr {
- au_id_t ai_auid; /* Audit user ID */
- au_mask_t ai_mask; /* Audit masks */
- au_tid_addr_t ai_termid; /* Terminal ID */
- au_asid_t ai_asid; /* Audit session ID */
+ au_id_t ai_auid; /* Audit user ID. */
+ au_mask_t ai_mask; /* Audit masks. */
+ au_tid_addr_t ai_termid; /* Terminal ID. */
+ au_asid_t ai_asid; /* Audit session ID. */
};
-typedef struct auditinfo_addr auditinfo_addr_t;
+typedef struct auditinfo_addr auditinfo_addr_t;
struct auditpinfo {
- pid_t ap_pid; /* ID of target process */
- au_id_t ap_auid; /* Audit user ID */
- au_mask_t ap_mask; /* Audit masks */
- au_tid_t ap_termid; /* Terminal ID */
- au_asid_t ap_asid; /* Audit session ID */
+ pid_t ap_pid; /* ID of target process. */
+ au_id_t ap_auid; /* Audit user ID. */
+ au_mask_t ap_mask; /* Audit masks. */
+ au_tid_t ap_termid; /* Terminal ID. */
+ au_asid_t ap_asid; /* Audit session ID. */
};
-typedef struct auditpinfo auditpinfo_t;
+typedef struct auditpinfo auditpinfo_t;
struct auditpinfo_addr {
- pid_t ap_pid; /* ID of target process */
- au_id_t ap_auid; /* Audit user ID */
- au_mask_t ap_mask; /* Audit masks */
- au_tid_addr_t ap_termid; /* Terminal ID */
- au_asid_t ap_asid; /* Audit session ID */
+ pid_t ap_pid; /* ID of target process. */
+ au_id_t ap_auid; /* Audit user ID. */
+ au_mask_t ap_mask; /* Audit masks. */
+ au_tid_addr_t ap_termid; /* Terminal ID. */
+ au_asid_t ap_asid; /* Audit session ID. */
};
-typedef struct auditpinfo_addr auditpinfo_addr_t;
+typedef struct auditpinfo_addr auditpinfo_addr_t;
-/* Token and record structures */
+/* Token and record structures. */
struct au_token {
- u_char *t_data;
- size_t len;
- TAILQ_ENTRY(au_token) tokens;
+ u_char *t_data;
+ size_t len;
+ TAILQ_ENTRY(au_token) tokens;
};
-typedef struct au_token token_t;
+typedef struct au_token token_t;
struct au_record {
- char used; /* Is this record currently being used */
- int desc; /* The descriptor associated with this record */
- TAILQ_HEAD(, au_token) token_q; /* queue of BSM tokens */
- u_char *data;
- size_t len;
- LIST_ENTRY(au_record) au_rec_q;
+ 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;
+typedef struct au_record au_record_t;
/*
* Kernel audit queue control parameters.
@@ -264,59 +267,59 @@
size_t aq_lowater;
size_t aq_bufsz;
clock_t aq_delay;
- int aq_minfree; /* minimum filesystem percent free space */
+ int aq_minfree; /* Minimum filesystem percent free space. */
};
-typedef struct au_qctrl au_qctrl_t;
+typedef struct au_qctrl au_qctrl_t;
/*
* Structure for the audit statistics.
*/
struct audit_stat {
- unsigned int as_version;
- unsigned int as_numevent;
- int as_generated;
- int as_nonattring;
- int as_kernel;
- int as_audit;
- int as_auditctl;
- int as_enqueu;
- int as_written;
- int as_wblocked;
- int as_rblocked;
- int as_dropped;
- int as_totalsize;
- unsigned int as_memused;
+ unsigned int as_version;
+ unsigned int as_numevent;
+ int as_generated;
+ int as_nonattring;
+ int as_kernel;
+ int as_audit;
+ int as_auditctl;
+ int as_enqueu;
+ int as_written;
+ int as_wblocked;
+ int as_rblocked;
+ int as_dropped;
+ int as_totalsize;
+ unsigned int as_memused;
};
-typedef struct audit_stat au_stat_t;
+typedef struct audit_stat au_stat_t;
/*
* Structure for the audit file statistics.
*/
struct audit_fstat {
- u_quad_t af_filesz;
- u_quad_t af_currsz;
+ u_quad_t af_filesz;
+ u_quad_t af_currsz;
};
-typedef struct audit_fstat au_fstat_t;
+typedef struct audit_fstat au_fstat_t;
/*
* Audit to event class mapping.
*/
struct au_evclass_map {
- au_event_t ec_number;
- au_class_t ec_class;
+ au_event_t ec_number;
+ au_class_t ec_class;
};
-typedef struct au_evclass_map au_evclass_map_t;
+typedef struct au_evclass_map au_evclass_map_t;
#if !defined(_KERNEL) && !defined(KERNEL)
-int audit(const void *, int);
-int auditon(int, void *, int);
-int auditctl(const char *);
-int getauid(au_id_t *);
-int setauid(const au_id_t *);
-int getaudit(struct auditinfo *);
-int setaudit(const struct auditinfo *);
-int getaudit_addr(struct auditinfo_addr *, int);
-int setaudit_addr(const struct auditinfo_addr *, int);
+int audit(const void *, int);
+int auditon(int, void *, int);
+int auditctl(const char *);
+int getauid(au_id_t *);
+int setauid(const au_id_t *);
+int getaudit(struct auditinfo *);
+int setaudit(const struct auditinfo *);
+int getaudit_addr(struct auditinfo_addr *, int);
+int setaudit_addr(const struct auditinfo_addr *, int);
#endif /* defined(_KERNEL) || defined(KERNEL) */
__END_DECLS
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message
More information about the trustedbsd-cvs
mailing list