summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHavoc Pennington <hp@localhost.localdomain>2007-10-19 17:20:06 -0400
committerHavoc Pennington <hp@localhost.localdomain>2007-10-19 17:20:06 -0400
commita8e32b6874cf4d6c2954d60e676562282bfce4ea (patch)
treeeea0e2d138808614a4af27ca54c322646905e8a2
parent53f6713976f4b82841f11c37e450c93bd700bde9 (diff)
add HAVE_SELINUX around call to audit_init() so things build without selinux
2007-10-19 Havoc Pennington <hp@redhat.com> * bus/bus.c (bus_context_new): put audit_init() in HAVE_SELINUX
-rw-r--r--ChangeLog8
-rw-r--r--bus/bus.c4
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b23657e..48b3c3a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,13 @@
-2007-10-19 Havoc Pennington <hp@redhat.com>
+2007-10-19 Havoc Pennington <hp@redhat.com>
+
+ * bus/bus.c (bus_context_new): put audit_init() in HAVE_SELINUX
+
+2007-10-19 Havoc Pennington <hp@redhat.com>
* bus/bus.c (bus_context_new): put the audit_init() in here
instead, which I believe ends up being the same as where it was
before, though I'm not sure I understand why it goes here.
-
+
* dbus/dbus-sysdeps-util-unix.c (_dbus_change_to_daemon_user):
remove audit_init() from here, this file can't depend on code in
bus/ directory
diff --git a/bus/bus.c b/bus/bus.c
index e675b467..d28a9368 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -759,8 +759,10 @@ bus_context_new (const DBusString *config_file,
_DBUS_ASSERT_ERROR_IS_SET (error);
goto failed;
}
-
+
+#ifdef HAVE_SELINUX
audit_init ();
+#endif
}
if (!bus_selinux_full_init ())