summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Carter <jwcart2@tycho.nsa.gov>2008-10-01 16:40:33 -0400
committerColin Walters <walters@verbum.org>2009-01-06 19:58:05 -0500
commitb12f1abe8505cc51b4d968f5214af59e79b9a14c (patch)
tree0fa163a013aa5d16a5e234c2b2dbfe8986e11354
parentd4602be39dfc827fc06efa21726f14b167540947 (diff)
Initialize AVC earlier so we can look up service security contexts
* bus/bus.c: Initialize AVC earlier: http://lists.freedesktop.org/archives/dbus/2008-October/010493.html Signed-off-by: Colin Walters <walters@verbum.org>
-rw-r--r--bus/bus.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/bus/bus.c b/bus/bus.c
index f5b6e7ec..f9cf118b 100644
--- a/bus/bus.c
+++ b/bus/bus.c
@@ -741,6 +741,11 @@ bus_context_new (const DBusString *config_file,
if (print_pid_pipe && _dbus_pipe_is_valid (print_pid_pipe) &&
!_dbus_pipe_is_stdout_or_stderr (print_pid_pipe))
_dbus_pipe_close (print_pid_pipe, NULL);
+
+ if (!bus_selinux_full_init ())
+ {
+ _dbus_warn ("SELinux initialization failed\n");
+ }
if (!process_config_postinit (context, parser, error))
{
@@ -771,11 +776,6 @@ bus_context_new (const DBusString *config_file,
#endif
}
- if (!bus_selinux_full_init ())
- {
- _dbus_warn ("SELinux initialization failed\n");
- }
-
dbus_server_free_data_slot (&server_data_slot);
return context;