From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 17 Sep 2012 23:55:24 +0000 (+0200)
Subject: selinux: prefer source path over fragment path
X-Git-Tag: v190~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aba15a0391a04d5444319a609737c6b05f71e7c9;p=thirdparty%2Fsystemd.git

selinux: prefer source path over fragment path
---

diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c
index d86f60e4980..3d3458bed7d 100644
--- a/src/core/dbus-unit.c
+++ b/src/core/dbus-unit.c
@@ -420,9 +420,9 @@ static DBusHandlerResult bus_unit_message_dispatch(Unit *u, DBusConnection *conn
                 connection,
                 message,
                 m,
-                (u->fragment_path ? u->fragment_path: u->source_path),
+                u->source_path ? u->source_path : u->fragment_path,
                 &error);
-        if (r)
+        if (r < 0)
                 return bus_send_error_reply(connection, message, &error, r);
 
         if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Unit", "Start"))
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index 30eab68336b..fc1df866cfe 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -684,7 +684,7 @@ int selinux_manager_access_check(DBusConnection *connection, DBusMessage *messag
                         }
                 }
 
-                path = (u->fragment_path ? u->fragment_path: u->source_path);
+                path = u->source_path ? u->source_path : u->fragment_path;
         }
         r = selinux_access_check(connection, message, m, error, perm, path);