From caa9222ba68917efbaeff33ac5a032a81b81be67 Mon Sep 17 00:00:00 2001 From: Tyler Hicks Date: Sun, 8 Feb 2015 23:02:38 -0600 Subject: [FIX FOR 06/13] fix: set DBusError if bus context cannot be retrieved Signed-off-by: Tyler Hicks --- bus/apparmor.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bus/apparmor.c b/bus/apparmor.c index 32380d7..660bc11 100644 --- a/bus/apparmor.c +++ b/bus/apparmor.c @@ -239,15 +239,17 @@ bus_apparmor_full_init (DBusError *error) { if (aa_getcon (&context, &mode) == -1) { - _dbus_warn ("Error getting AppArmor context of bus: %s\n", - _dbus_strerror (errno)); + dbus_set_error (error, DBUS_ERROR_FAILED, + "Error getting AppArmor context of bus: %s\n", + _dbus_strerror (errno)); return FALSE; } bus_con = bus_apparmor_confinement_new (context, mode); if (bus_con == NULL) { - _dbus_warn ("Error allocating bus AppArmor confinement\n"); + dbus_set_error (error, DBUS_ERROR_FAILED, + "Error allocating bus AppArmor confinement\n"); free (context); return FALSE; } -- 2.1.0