diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 14:59:18 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-06 14:59:18 -0400 |
| commit | 5047f09b56d0bc3c21aec9cb16de60283da645c6 (patch) | |
| tree | 09a07554b933c3bb912ce3bfc0ea7c7e1f16041c /kernel/audit.h | |
| parent | c0f1fe00c3923135b2c2f443448585482da8a53e (diff) | |
| parent | 5528e568a760442e0ec8fd2dea1f0791875a066b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'kernel/audit.h')
| -rw-r--r-- | kernel/audit.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel/audit.h b/kernel/audit.h index bc5392076e2b..6f733920fd32 100644 --- a/kernel/audit.h +++ b/kernel/audit.h | |||
| @@ -54,9 +54,11 @@ enum audit_state { | |||
| 54 | 54 | ||
| 55 | /* Rule lists */ | 55 | /* Rule lists */ |
| 56 | struct audit_field { | 56 | struct audit_field { |
| 57 | u32 type; | 57 | u32 type; |
| 58 | u32 val; | 58 | u32 val; |
| 59 | u32 op; | 59 | u32 op; |
| 60 | char *se_str; | ||
| 61 | struct selinux_audit_rule *se_rule; | ||
| 60 | }; | 62 | }; |
| 61 | 63 | ||
| 62 | struct audit_krule { | 64 | struct audit_krule { |
| @@ -86,3 +88,5 @@ extern void audit_send_reply(int pid, int seq, int type, | |||
| 86 | extern void audit_log_lost(const char *message); | 88 | extern void audit_log_lost(const char *message); |
| 87 | extern void audit_panic(const char *message); | 89 | extern void audit_panic(const char *message); |
| 88 | extern struct mutex audit_netlink_mutex; | 90 | extern struct mutex audit_netlink_mutex; |
| 91 | |||
| 92 | extern int selinux_audit_rule_update(void); | ||