From 53f6713976f4b82841f11c37e450c93bd700bde9 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 19 Oct 2007 15:05:27 -0400 Subject: do not call audit_init() from bus/ directory from files in dbus/ 2007-10-19 Havoc Pennington * 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 --- ChangeLog | 10 ++++++++++ bus/bus.c | 2 ++ dbus/dbus-sysdeps-util-unix.c | 1 - 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0a78e55c..4b23657e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-10-19 Havoc Pennington + + * 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 * configure.in: *Actually* fix detection of i486 atomic ops - diff --git a/bus/bus.c b/bus/bus.c index c2ea1157..e675b467 100644 --- 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 e03e0b76..49965d9a 100644 --- 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 -- cgit