do not call audit_init() from bus/ directory from files in dbus/

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/ChangeLog b/ChangeLog
index 0a78e55c8d2969942ca66c7a126052bf1e365cdd..4b23657e4512428bf46c58a7ea9d16b18361b1d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+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
+
 2007-10-16  Simon McVittie  <simon.mcvittie@collabora.co.uk>
 
        * configure.in: *Actually* fix detection of i486 atomic ops -

diff --git a/bus/bus.c b/bus/bus.c
index c2ea1157490f7f99acf95f4eda70d3da75738a43..e675b467de3e0418abb151282564ee82f1f60c11 100644 (file)
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -759,6 +759,8 @@ bus_context_new (const DBusString *config_file,
          _DBUS_ASSERT_ERROR_IS_SET (error);
          goto failed;
        }
+      
+      audit_init ();
     }
 
   if (!bus_selinux_full_init ())

diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
index e03e0b76ea43b7a969afe975ed9f36801c5e9ec4..49965d9a0287bc6a88e918dc7784b86e9bc294e0 100644 (file)
--- a/dbus/dbus-sysdeps-util-unix.c
+++ b/dbus/dbus-sysdeps-util-unix.c
@@ -433,7 +433,6 @@ _dbus_change_to_daemon_user  (const char    *user,
                           _dbus_strerror (errno));
           return FALSE;
         }
-      audit_init();
     }
 #endif