diff options
| author |   Gary Tierney <gary.tierney@gmx.com> | 2017-05-02 17:42:19 +0100 |
|---|---|---|
| committer | Gary Tierney <gary.tierney@gmx.com> | 2017-05-12 14:43:39 +0100 |
| commit | 6d395665e5ce7b64f3de4c9550c0779843e6cc44 (patch) | |
| tree | 3b18a7a2ac745fac0393a23f2eab61479e64e855 /src/test/test-selinux.c | |
| parent | Merge pull request #5432 from keszybz/udev-logging (diff) | |
| download | systemd-6d395665e5ce7b64f3de4c9550c0779843e6cc44.tar.gz systemd-6d395665e5ce7b64f3de4c9550c0779843e6cc44.tar.bz2 systemd-6d395665e5ce7b64f3de4c9550c0779843e6cc44.zip | |
Revert "selinux: split up mac_selinux_have() from mac_selinux_use()"
This reverts commit 6355e75610a8d47fc3ba5ab8bd442172a2cfe574.
The previously mentioned commit inadvertently broke a lot of SELinux related
functionality for both unprivileged users and systemd instances running as
MANAGER_USER. In particular, setting the correct SELinux context after a User=
directive is used would fail to work since we attempt to set the security
context after changing UID. Additionally, it causes activated socket units to
be mislabeled for systemd --user processes since setsockcreatecon() would never
be called.
Reverting this fixes the issues with labeling outlined above, and reinstates
SELinux access checks on unprivileged user services.
Diffstat (limited to 'src/test/test-selinux.c')
| -rw-r--r-- | src/test/test-selinux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/test/test-selinux.c b/src/test/test-selinux.c index b676c2591..190736aa4 100644 --- a/src/test/test-selinux.c +++ b/src/test/test-selinux.c @@ -35,16 +35,16 @@ static void test_testing(void) { b = mac_selinux_use(); log_info("mac_selinux_use → %s", yes_no(b)); - b = mac_selinux_have(); - log_info("mac_selinux_have → %s", yes_no(b)); + b = mac_selinux_use(); + log_info("mac_selinux_use → %s", yes_no(b)); mac_selinux_retest(); b = mac_selinux_use(); log_info("mac_selinux_use → %s", yes_no(b)); - b = mac_selinux_have(); - log_info("mac_selinux_have → %s", yes_no(b)); + b = mac_selinux_use(); + log_info("mac_selinux_use → %s", yes_no(b)); } static void test_loading(void) { |