diff options
| author | Richard Guy Briggs <rgb@redhat.com> | 2018-11-16 12:17:35 -0500 |
|---|---|---|
| committer | Paul Moore <paul@paul-moore.com> | 2018-11-19 16:29:50 -0500 |
| commit | c8fc5d49c341805fee7fc295f2ea8a709f78aec4 (patch) | |
| tree | 8bc5943fbbbab088423106c91b61519dcb49b843 /kernel/audit.h | |
| parent | a2c97da11cdb973b752dd434aee9636ce10ee737 (diff) | |
| download | linux-stable-c8fc5d49c341805fee7fc295f2ea8a709f78aec4.tar.gz linux-stable-c8fc5d49c341805fee7fc295f2ea8a709f78aec4.tar.bz2 linux-stable-c8fc5d49c341805fee7fc295f2ea8a709f78aec4.zip | |
audit: remove WATCH and TREE config options
Remove the CONFIG_AUDIT_WATCH and CONFIG_AUDIT_TREE config options since
they are both dependent on CONFIG_AUDITSYSCALL and force
CONFIG_FSNOTIFY.
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'kernel/audit.h')
| -rw-r--r-- | kernel/audit.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/audit.h b/kernel/audit.h index 9a3828bd387b..0b5295aeaebb 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -268,7 +268,7 @@ extern struct tty_struct *audit_get_tty(struct task_struct *tsk); extern void audit_put_tty(struct tty_struct *tty); /* audit watch functions */ -#ifdef CONFIG_AUDIT_WATCH +#ifdef CONFIG_AUDITSYSCALL extern void audit_put_watch(struct audit_watch *watch); extern void audit_get_watch(struct audit_watch *watch); extern int audit_to_watch(struct audit_krule *krule, char *path, int len, u32 op); @@ -301,9 +301,9 @@ extern int audit_exe_compare(struct task_struct *tsk, struct audit_fsnotify_mark #define audit_mark_compare(m, i, d) 0 #define audit_exe_compare(t, m) (-EINVAL) #define audit_dupe_exe(n, o) (-EINVAL) -#endif /* CONFIG_AUDIT_WATCH */ +#endif /* CONFIG_AUDITSYSCALL */ -#ifdef CONFIG_AUDIT_TREE +#ifdef CONFIG_AUDITSYSCALL extern struct audit_chunk *audit_tree_lookup(const struct inode *inode); extern void audit_put_chunk(struct audit_chunk *chunk); extern bool audit_tree_match(struct audit_chunk *chunk, struct audit_tree *tree); |