X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-path.c;h=1e62083d9b4c66200f67f2fac36269779a0e5a5f;hb=112a7f4696ebb96abdb42df62e1e794e903f66b3;hp=b77b5191c91a5c266dabab451070a9b0077ce705;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git diff --git a/src/core/dbus-path.c b/src/core/dbus-path.c index b77b5191c..1e62083d9 100644 --- a/src/core/dbus-path.c +++ b/src/core/dbus-path.c @@ -25,6 +25,7 @@ #include "dbus-path.h" #include "dbus-execute.h" #include "dbus-common.h" +#include "selinux-access.h" #define BUS_PATH_INTERFACE \ " \n" \ @@ -83,15 +84,15 @@ static int bus_path_append_paths(DBusMessageIter *i, const char *property, void } static int bus_path_append_unit(DBusMessageIter *i, const char *property, void *data) { - Unit *u = data; - Path *p = PATH(u); + Unit *u = data, *trigger; const char *t; assert(i); assert(property); assert(u); - t = UNIT_DEREF(p->unit) ? UNIT_DEREF(p->unit)->id : ""; + trigger = UNIT_TRIGGER(u); + t = trigger ? trigger->id : ""; return dbus_message_iter_append_basic(i, DBUS_TYPE_STRING, &t) ? 0 : -ENOMEM; } @@ -115,5 +116,7 @@ DBusHandlerResult bus_path_message_handler(Unit *u, DBusConnection *c, DBusMessa { NULL, } }; + SELINUX_UNIT_ACCESS_CHECK(u, c, message, "status"); + return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps); }