diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-10-02 17:56:54 -0400 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-10-02 17:56:54 -0400 |
| commit | ffc227c9568eb0a12dc750761d1e5d68ea125aad (patch) | |
| tree | 09b2020ac0b6baee2902ad4891d6cbb292f31216 /src/core/selinux-access.h | |
| parent | c1165f822cd9f8c3467b5f825ce933ab8374b361 (diff) | |
selinux: remove anything PID1-specific from selinux-access.[ch] so that we can reuse it in logind
Diffstat (limited to 'src/core/selinux-access.h')
| -rw-r--r-- | src/core/selinux-access.h | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h index 5902b2f862..9183cbc9a6 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 |