diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | bus/bus.c | 3 | ||||
| -rw-r--r-- | bus/selinux.c | 2 | ||||
| -rw-r--r-- | bus/selinux.h | 1 |
4 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2007-10-23 Havoc Pennington <hp@redhat.com> + + * 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 <hp@redhat.com> * bus/bus.c (bus_context_new): put audit_init() in HAVE_SELINUX @@ -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 8c7a6f83..735a76d4 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 0d8353d8..462a79b4 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 */ |