summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wright <chrisw@osdl.org>2005-05-11 10:52:45 +0100
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>2005-05-11 10:52:45 +0100
commit804a6a49d874841a98ebea3247ad2e672812ad6a (patch)
tree84bd717927666811d55f31346387f8cb99dff346
parent5a241d77039a2632e81070619d5733258728f8bd (diff)
downloadlinux-3.10-804a6a49d874841a98ebea3247ad2e672812ad6a.tar.gz
linux-3.10-804a6a49d874841a98ebea3247ad2e672812ad6a.tar.bz2
linux-3.10-804a6a49d874841a98ebea3247ad2e672812ad6a.zip
Audit requires CONFIG_NET
Audit now actually requires netlink. So make it depend on CONFIG_NET, and remove the inline dependencies on CONFIG_NET. Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r--init/Kconfig1
-rw-r--r--kernel/audit.c30
-rw-r--r--kernel/auditsc.c2
3 files changed, 1 insertions, 32 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 70549765346..448939d183d 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -164,6 +164,7 @@ config SYSCTL
config AUDIT
bool "Auditing support"
+ depends on NET
default y if SECURITY_SELINUX
help
Enable auditing infrastructure that can be used with another
diff --git a/kernel/audit.c b/kernel/audit.c
index a5f03cb2c0f..dc4aba21f30 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -283,7 +283,6 @@ static int audit_set_failure(int state, uid_t loginuid)
return old;
}
-#ifdef CONFIG_NET
void audit_send_reply(int pid, int seq, int type, int done, int multi,
void *payload, int size)
{
@@ -531,35 +530,6 @@ static int __init audit_init(void)
audit_log(NULL, "initialized");
return 0;
}
-
-#else
-/* Without CONFIG_NET, we have no skbuffs. For now, print what we have
- * in the buffer. */
-static void audit_log_move(struct audit_buffer *ab)
-{
- printk(KERN_ERR "%*.*s\n", ab->len, ab->len, ab->tmp);
- ab->len = 0;
-}
-
-static inline int audit_log_drain(struct audit_buffer *ab)
-{
- return 0;
-}
-
-/* Initialize audit support at boot time. */
-int __init audit_init(void)
-{
- printk(KERN_INFO "audit: initializing WITHOUT netlink support\n");
- audit_sock = NULL;
- audit_pid = 0;
-
- audit_initialized = 1;
- audit_enabled = audit_default;
- audit_log(NULL, "initialized");
- return 0;
-}
-#endif
-
__initcall(audit_init);
/* Process kernel command-line parameter at boot time. audit=0 or audit=1. */
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
index f1bf66510cd..680bb928343 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
@@ -226,7 +226,6 @@ static inline int audit_del_rule(struct audit_rule *rule,
return -EFAULT; /* No matching rule */
}
-#ifdef CONFIG_NET
/* Copy rule from user-space to kernel-space. Called during
* AUDIT_ADD. */
static int audit_copy_rule(struct audit_rule *d, struct audit_rule *s)
@@ -305,7 +304,6 @@ int audit_receive_filter(int type, int pid, int uid, int seq, void *data,
return err;
}
-#endif
/* Compare a task_struct with an audit_rule. Return 1 on match, 0
* otherwise. */