diff options
| author | Lennart Poettering <lennart@poettering.net> | 2023-08-21 18:48:19 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-08-21 18:50:29 +0200 |
| commit | e2fc0a72223bf1b4b1e2de9e9aa8169ec93ef8f9 (patch) | |
| tree | 34ae54440c90a9ee787640f523ab7b2e56aad33f /src/core | |
| parent | seccomp: move seccomp_parse_errno_or_action() into common definitions (diff) | |
| download | systemd-e2fc0a72223bf1b4b1e2de9e9aa8169ec93ef8f9.tar.xz systemd-e2fc0a72223bf1b4b1e2de9e9aa8169ec93ef8f9.zip | |
tree-wide: don't ifdef seccomp-util.h, drop seccomp.h inclusion everywhere
seccomp-util.h doesn't need ifdeffing, hence don't. It has worked since
quite a while with HAVE_SECCOMP is off, hence use it everywhere.
Also drop explicit seccomp.h inclusion everywhere (which needs
HAVE_SECCOMP ifdeffery everywhere). seccomp-util.h includes it anyway,
automatically, which we can just rely on, and it deals with HAVE_SECCOMP
at one central place.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/dbus-execute.c | 7 | ||||
| -rw-r--r-- | src/core/execute.c | 6 | ||||
| -rw-r--r-- | src/core/load-fragment.c | 5 | ||||
| -rw-r--r-- | src/core/main.c | 5 |
4 files changed, 0 insertions, 23 deletions
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 52964390ae..395051e57f 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -2,11 +2,6 @@ #include <sys/mount.h> #include <sys/prctl.h> - -#if HAVE_SECCOMP -#include <seccomp.h> -#endif - #include "af-list.h" #include "alloc-util.h" #include "bus-get-properties.h" @@ -37,9 +32,7 @@ #include "pcre2-util.h" #include "process-util.h" #include "rlimit-util.h" -#if HAVE_SECCOMP #include "seccomp-util.h" -#endif #include "securebits-util.h" #include "specifier.h" #include "stat-util.h" diff --git a/src/core/execute.c b/src/core/execute.c index f9761b7239..5ffb088aee 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -26,10 +26,6 @@ #include <selinux/selinux.h> #endif -#if HAVE_SECCOMP -#include <seccomp.h> -#endif - #if HAVE_APPARMOR #include <sys/apparmor.h> #endif @@ -93,9 +89,7 @@ #include "recurse-dir.h" #include "rlimit-util.h" #include "rm-rf.h" -#if HAVE_SECCOMP #include "seccomp-util.h" -#endif #include "securebits-util.h" #include "selinux-util.h" #include "signal-util.h" diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index ceca070e79..9d1fd0f7a7 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -7,9 +7,6 @@ #include <fcntl.h> #include <linux/fs.h> #include <linux/oom.h> -#if HAVE_SECCOMP -#include <seccomp.h> -#endif #include <sched.h> #include <sys/resource.h> @@ -56,9 +53,7 @@ #include "pcre2-util.h" #include "percent-util.h" #include "process-util.h" -#if HAVE_SECCOMP #include "seccomp-util.h" -#endif #include "securebits-util.h" #include "selinux-util.h" #include "signal-util.h" diff --git a/src/core/main.c b/src/core/main.c index c09f922700..df9cfa21aa 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -8,9 +8,6 @@ #include <sys/prctl.h> #include <sys/utsname.h> #include <unistd.h> -#if HAVE_SECCOMP -#include <seccomp.h> -#endif #if HAVE_VALGRIND_VALGRIND_H # include <valgrind/valgrind.h> #endif @@ -82,9 +79,7 @@ #include "psi-util.h" #include "random-util.h" #include "rlimit-util.h" -#if HAVE_SECCOMP #include "seccomp-util.h" -#endif #include "selinux-setup.h" #include "selinux-util.h" #include "signal-util.h" |