From cad45ba11ec3572296361f53f5852ffb97a97fa3 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 2 Oct 2012 17:07:00 -0400 Subject: selinux: rework selinux access check logic a) Instead of parsing the bus messages inside of selinux-access.c simply pass everything pre-parsed in the functions b) implement the access checking with a macro that resolves to nothing on non-selinux builds c) split out the selinux checks into their own sources selinux-util.[ch] d) this unifies the job creation code behind the D-Bus calls Manager.StartUnit() and Unit.Start(). --- src/systemctl/systemctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/systemctl') diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index 62c32cd31a..a4bec49657 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -1445,7 +1445,7 @@ static void check_triggering_units( DBusConnection *bus, const char *unit_name) { - DBusMessage _cleanup_dbus_msg_unref_ *reply = NULL; + _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; DBusMessageIter iter, sub; char *service_trigger = NULL; const char *interface = "org.freedesktop.systemd1.Unit", @@ -1523,7 +1523,7 @@ static int start_unit_one( DBusError *error, Set *s) { - DBusMessage _cleanup_dbus_msg_unref_ *reply = NULL; + _cleanup_dbus_message_unref_ DBusMessage *reply = NULL; const char *path; int r; _cleanup_free_ char *n, *p = NULL; -- cgit v1.2.3-54-g00ecf