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

diff --git a/ChangeLog b/ChangeLog
index 4b23657e4512428bf46c58a7ea9d16b18361b1d4..48b3c3a477ccc5fe5dfadfa9191fde62d16264a7 100644 (file)
--- 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 e675b467de3e0418abb151282564ee82f1f60c11..d28a9368d3305345dd67f5f5ff2d20700da8310d 100644 (file)
--- 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 ())