From: Havoc Pennington <hp@localhost.localdomain>
Date: Fri, 19 Oct 2007 21:20:06 +0000 (-0400)
Subject: add HAVE_SELINUX around call to audit_init() so things build without selinux
X-Git-Tag: dbus-1.1.3~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8e32b6874cf4d6c2954d60e676562282bfce4ea;p=thirdparty%2Fdbus.git

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 4b23657e4..48b3c3a47 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 e675b467d..d28a9368d 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 ())