diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2023-05-31 14:35:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-31 14:35:50 +0200 |
| commit | 05d1cbb33c1bdc86c86a7f785d1695f3be5e10db (patch) | |
| tree | ddb9f8f25cd5492d34968ec830ba0da50a9d6b7d /src/core | |
| parent | Merge pull request #27860 from poettering/loopback-no-prefix-route (diff) | |
| parent | fs-util: Add XOpenFlags with XO_LABEL flag to have xopenat() MAC label files/... (diff) | |
| download | systemd-05d1cbb33c1bdc86c86a7f785d1695f3be5e10db.tar.xz systemd-05d1cbb33c1bdc86c86a7f785d1695f3be5e10db.zip | |
Merge pull request #26969 from DaanDeMeyer/xopenat-label
fs-util: Add labelling support to xopenat()
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/automount.c | 2 | ||||
| -rw-r--r-- | src/core/execute.c | 2 | ||||
| -rw-r--r-- | src/core/main.c | 8 | ||||
| -rw-r--r-- | src/core/manager.c | 2 | ||||
| -rw-r--r-- | src/core/namespace.c | 2 | ||||
| -rw-r--r-- | src/core/socket.c | 2 | ||||
| -rw-r--r-- | src/core/unit.c | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/src/core/automount.c b/src/core/automount.c index 5df697bf22..3254275d6b 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -21,7 +21,7 @@ #include "format-util.h" #include "fstab-util.h" #include "io-util.h" -#include "label.h" +#include "label-util.h" #include "mkdir-label.h" #include "mount-util.h" #include "mount.h" diff --git a/src/core/execute.c b/src/core/execute.c index 5e327465da..b2804e52e9 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -65,7 +65,7 @@ #include "hexdecoct.h" #include "io-util.h" #include "ioprio-util.h" -#include "label.h" +#include "label-util.h" #include "log.h" #include "macro.h" #include "manager.h" diff --git a/src/core/main.c b/src/core/main.c index 08d416bc14..c69f9b9afe 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -2849,8 +2849,8 @@ int main(int argc, char *argv[]) { goto finish; } - if (mac_selinux_init() < 0) { - error_message = "Failed to initialize SELinux support"; + if (mac_init() < 0) { + error_message = "Failed to initialize MAC support"; goto finish; } @@ -2922,8 +2922,8 @@ int main(int argc, char *argv[]) { * operate. */ capability_ambient_set_apply(0, /* also_inherit= */ false); - if (mac_selinux_init() < 0) { - error_message = "Failed to initialize SELinux support"; + if (mac_init() < 0) { + error_message = "Failed to initialize MAC support"; goto finish; } } diff --git a/src/core/manager.c b/src/core/manager.c index f8d469ebf6..78d1a032e6 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -54,7 +54,7 @@ #include "inotify-util.h" #include "install.h" #include "io-util.h" -#include "label.h" +#include "label-util.h" #include "load-fragment.h" #include "locale-setup.h" #include "log.h" diff --git a/src/core/namespace.c b/src/core/namespace.c index 1116ece59d..b00f27e08f 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -22,7 +22,7 @@ #include "fd-util.h" #include "format-util.h" #include "glyph-util.h" -#include "label.h" +#include "label-util.h" #include "list.h" #include "lock-util.h" #include "loop-util.h" diff --git a/src/core/socket.c b/src/core/socket.c index a6477de5a0..7c596182c2 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -26,7 +26,7 @@ #include "in-addr-util.h" #include "io-util.h" #include "ip-protocol-list.h" -#include "label.h" +#include "label-util.h" #include "log.h" #include "mkdir-label.h" #include "parse-util.h" diff --git a/src/core/unit.c b/src/core/unit.c index 90f87a95f5..55bc926c2f 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -32,7 +32,7 @@ #include "id128-util.h" #include "install.h" #include "io-util.h" -#include "label.h" +#include "label-util.h" #include "load-dropin.h" #include "load-fragment.h" #include "log.h" |