From 5340b8de0b537380e0c445495300739d75abeb2f Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 23 Oct 2007 14:48:52 -0400 Subject: [PATCH] audit_init() was not declared in header, causing warnings; fix this and namespace it 2007-10-23 Havoc Pennington * bus/bus.c (bus_context_new): use the new name here * bus/selinux.c (bus_selinux_audit_init): rename from audit_init() to avoid possible libc conflict, and declare it in .h file to avoid a warning --- ChangeLog | 8 ++++++++ bus/bus.c | 3 ++- bus/selinux.c | 2 +- bus/selinux.h | 1 + 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48b3c3a..8e95058 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-10-23 Havoc Pennington + + * bus/bus.c (bus_context_new): use the new name here + + * bus/selinux.c (bus_selinux_audit_init): rename from audit_init() + to avoid possible libc conflict, and declare it in .h file to + avoid a warning + 2007-10-19 Havoc Pennington * bus/bus.c (bus_context_new): put audit_init() in HAVE_SELINUX diff --git a/bus/bus.c b/bus/bus.c index d28a936..99e4856 100644 --- a/bus/bus.c +++ b/bus/bus.c @@ -761,7 +761,8 @@ bus_context_new (const DBusString *config_file, } #ifdef HAVE_SELINUX - audit_init (); + /* FIXME - why not just put this in full_init() below? */ + bus_selinux_audit_init (); #endif } diff --git a/bus/selinux.c b/bus/selinux.c index 8c7a6f8..735a76d 100644 --- a/bus/selinux.c +++ b/bus/selinux.c @@ -114,7 +114,7 @@ static int audit_fd = -1; #endif void -audit_init(void) +bus_selinux_audit_init(void) { #ifdef HAVE_LIBAUDIT audit_fd = audit_open (); diff --git a/bus/selinux.h b/bus/selinux.h index 0d8353d..462a79b 100644 --- a/bus/selinux.h +++ b/bus/selinux.h @@ -67,5 +67,6 @@ BusSELinuxID* bus_selinux_init_connection_id (DBusConnection *connection, DBusError *error); +void bus_selinux_audit_init(void); #endif /* BUS_SELINUX_H */ -- 2.7.4