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>

diff --git a/init/Kconfig b/init/Kconfig
index 705497653465d2bf51ead61515812f199eb39399..448939d183dd1f8aed00f20c2b397d3ca6b00e6b 100644 (file)
--- 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 a5f03cb2c0f5896e917ea95d2f1ce1f9443a6367..dc4aba21f30a8fa6f07a111ee40009412f0a24fd 100644 (file)
--- 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 f1bf66510cd3e9817d44ab70cbf44e6192321840..680bb928343b880ff97c8d24553c3b375eed0c33 100644 (file)
--- 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. */