X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fselinux-access.h;h=9183cbc9a611278ebdb5ac44b05c419d2a1c6ca5;hb=ffc227c9568eb0a12dc750761d1e5d68ea125aad;hp=5902b2f862f97de322e22792bfa3a8cd0dd39d86;hpb=cad45ba11ec3572296361f53f5852ffb97a97fa3;p=elogind.git

diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h
index 5902b2f86..9183cbc9a 100644
--- a/src/core/selinux-access.h
+++ b/src/core/selinux-access.h
@@ -21,20 +21,22 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-void selinux_access_finish(void);
-int selinux_manager_access_check(Manager *manager, DBusConnection *connection, DBusMessage *message, const char *permission, DBusError *error);
-int selinux_unit_access_check(Unit *unit, DBusConnection *connection, DBusMessage *message, const char *permission, DBusError *error);
+#include <dbus.h>
+
+void selinux_access_free(void);
+
+int selinux_access_check(DBusConnection *connection, DBusMessage *message, const char *path, const char *permission, DBusError *error);
 
 #ifdef HAVE_SELINUX
 
-#define SELINUX_MANAGER_ACCESS_CHECK(manager, connection, message, permission)   \
+#define SELINUX_ACCESS_CHECK(connection, message, permission) \
         do {                                                            \
                 DBusError _error;                                       \
                 int _r;                                                 \
                 DBusConnection *_c = (connection);                      \
                 DBusMessage *_m = (message);                            \
                 dbus_error_init(&_error);                               \
-                _r = selinux_manager_access_check((manager), _c, _m, (permission), &_error); \
+                _r = selinux_access_check(_c, _m, NULL, (permission), &_error); \
                 if (_r < 0)                                             \
                         return bus_send_error_reply(_c, _m, &_error, _r); \
         } while (false)
@@ -45,15 +47,16 @@ int selinux_unit_access_check(Unit *unit, DBusConnection *connection, DBusMessag
                 int _r;                                                 \
                 DBusConnection *_c = (connection);                      \
                 DBusMessage *_m = (message);                            \
+                Unit *_u = (unit);                                      \
                 dbus_error_init(&_error);                               \
-                _r = selinux_unit_access_check((unit), _c, _m, (permission), &_error); \
+                _r = selinux_access_check(_c, _m, _u->source_path ?: _u->fragment_path, (permission), &_error); \
                 if (_r < 0)                                             \
                         return bus_send_error_reply(_c, _m, &_error, _r); \
         } while (false)
 
 #else
 
-#define SELINUX_MANAGER_ACCESS_CHECK(manager, connection, message, permission) do { } while (false)
+#define SELINUX_ACCESS_CHECK(connection, message, permission) do { } while (false)
 #define SELINUX_UNIT_ACCESS_CHECK(unit, connection, message, permission) do { } while (false)
 
 #endif