diff options
| -rw-r--r-- | man/systemd.exec.xml | 4 | ||||
| -rw-r--r-- | src/core/execute.c | 20 |
2 files changed, 16 insertions, 8 deletions
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml index 4281c03cf6..ecf48a73c9 100644 --- a/man/systemd.exec.xml +++ b/man/systemd.exec.xml @@ -956,7 +956,9 @@ <listitem><para>Set the SELinux context of the executed process. If set, this will override the automated domain transition. However, the policy - still need to autorize the transition. See + still need to autorize the transition. This directive + is ignored if SELinux is disabled. If prefixed by <literal>-</literal>, + all errors will be ignored. See <citerefentry><refentrytitle>setexeccon</refentrytitle><manvolnum>3</manvolnum></citerefentry> for details.</para></listitem> </varlistentry> diff --git a/src/core/execute.c b/src/core/execute.c index 474a4af895..437065465d 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -72,6 +72,7 @@ #include "fileio.h" #include "unit.h" #include "async.h" +#include "selinux-util.h" #define IDLE_TIMEOUT_USEC (5*USEC_PER_SEC) #define IDLE_TIMEOUT2_USEC (1*USEC_PER_SEC) @@ -1570,13 +1571,18 @@ int exec_spawn(ExecCommand *command, } #ifdef HAVE_SELINUX if (context->selinux_context && use_selinux()) { - err = security_check_context(context->selinux_context); - if (err < 0) { - r = EXIT_SELINUX_CONTEXT; - goto fail_child; - } - err = setexeccon(context->selinux_context); - if (err < 0) { + bool ignore; + char* c; + + c = context->selinux_context; + if (c[0] == '-') { + c++; + ignore = true; + } else + ignore = false; + + err = setexeccon(c); + if (err < 0 && !ignore) { r = EXIT_SELINUX_CONTEXT; goto fail_child; } |