diff options
32 files changed, 35 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index dada6cd85f..d435141492 100644 --- a/Makefile.am +++ b/Makefile.am @@ -762,8 +762,8 @@ noinst_LTLIBRARIES += \ libbasic_la_SOURCES = \ src/basic/missing.h \ - src/basic/capability.c \ - src/basic/capability.h \ + src/basic/capability-util.c \ + src/basic/capability-util.h \ src/basic/conf-files.c \ src/basic/conf-files.h \ src/basic/hostname-util.h \ @@ -898,8 +898,8 @@ libbasic_la_SOURCES = \ src/basic/login-util.c \ src/basic/cap-list.c \ src/basic/cap-list.h \ - src/basic/audit.c \ - src/basic/audit.h \ + src/basic/audit-util.c \ + src/basic/audit-util.h \ src/basic/xml.c \ src/basic/xml.h \ src/basic/json.c \ diff --git a/src/basic/audit.c b/src/basic/audit-util.c index 4957fc1bec..93d1adaf99 100644 --- a/src/basic/audit.c +++ b/src/basic/audit-util.c @@ -22,7 +22,7 @@ #include <errno.h> #include <stdio.h> -#include "audit.h" +#include "audit-util.h" #include "fd-util.h" #include "fileio.h" #include "macro.h" diff --git a/src/basic/audit.h b/src/basic/audit-util.h index 6de331c73e..6de331c73e 100644 --- a/src/basic/audit.h +++ b/src/basic/audit-util.h diff --git a/src/basic/capability.c b/src/basic/capability-util.c index 04c7047a6a..3a6ceed6f5 100644 --- a/src/basic/capability.c +++ b/src/basic/capability-util.c @@ -26,7 +26,7 @@ #include <sys/prctl.h> #include <unistd.h> -#include "capability.h" +#include "capability-util.h" #include "fileio.h" #include "log.h" #include "macro.h" diff --git a/src/basic/capability.h b/src/basic/capability-util.h index 4eb5c2a835..4eb5c2a835 100644 --- a/src/basic/capability.h +++ b/src/basic/capability-util.h diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c index 7e7574568c..fc8edaeb36 100644 --- a/src/bus-proxyd/bus-proxyd.c +++ b/src/bus-proxyd/bus-proxyd.c @@ -35,7 +35,7 @@ #include "bus-internal.h" #include "bus-xml-policy.h" -#include "capability.h" +#include "capability-util.h" #include "def.h" #include "fd-util.h" #include "formats-util.h" diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 950e463bc5..35f1b2913b 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -27,7 +27,7 @@ #include "af-list.h" #include "bus-util.h" -#include "capability.h" +#include "capability-util.h" #include "dbus-execute.h" #include "env-util.h" #include "execute.h" diff --git a/src/core/execute.c b/src/core/execute.c index f354216325..2982125b82 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -60,7 +60,7 @@ #include "barrier.h" #include "bus-endpoint.h" #include "cap-list.h" -#include "capability.h" +#include "capability-util.h" #include "def.h" #include "env-util.h" #include "errno-list.h" diff --git a/src/core/kmod-setup.c b/src/core/kmod-setup.c index 2068ffd69b..651f79a1fe 100644 --- a/src/core/kmod-setup.c +++ b/src/core/kmod-setup.c @@ -27,7 +27,7 @@ #endif #include "macro.h" -#include "capability.h" +#include "capability-util.h" #include "bus-util.h" #include "kmod-setup.h" diff --git a/src/core/main.c b/src/core/main.c index 3e4e9199ed..fd8ad0c0ea 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -44,7 +44,7 @@ #include "build.h" #include "bus-error.h" #include "bus-util.h" -#include "capability.h" +#include "capability-util.h" #include "clock-util.h" #include "conf-parser.h" #include "cpu-set-util.h" diff --git a/src/import/import-common.c b/src/import/import-common.c index d96a000f81..a8551ca9e8 100644 --- a/src/import/import-common.c +++ b/src/import/import-common.c @@ -25,7 +25,7 @@ #include <unistd.h> #include "btrfs-util.h" -#include "capability.h" +#include "capability-util.h" #include "fd-util.h" #include "import-common.h" #include "signal-util.h" diff --git a/src/import/pull-common.c b/src/import/pull-common.c index 17283a4a24..f9c168e374 100644 --- a/src/import/pull-common.c +++ b/src/import/pull-common.c @@ -22,7 +22,7 @@ #include <sys/prctl.h> #include "btrfs-util.h" -#include "capability.h" +#include "capability-util.h" #include "copy.h" #include "dirent-util.h" #include "escape.h" diff --git a/src/journal/coredump.c b/src/journal/coredump.c index 257a665819..b9ece73a81 100644 --- a/src/journal/coredump.c +++ b/src/journal/coredump.c @@ -34,7 +34,7 @@ #include "sd-login.h" #include "acl-util.h" -#include "capability.h" +#include "capability-util.h" #include "cgroup-util.h" #include "compress.h" #include "conf-parser.h" diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index ab213f705d..442fbb8ecd 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -34,6 +34,7 @@ #include "sd-messages.h" #include "acl-util.h" +#include "audit-util.h" #include "cgroup-util.h" #include "conf-parser.h" #include "dirent-util.h" diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h index 535c0ab9ab..a2631c6017 100644 --- a/src/journal/journald-server.h +++ b/src/journal/journald-server.h @@ -25,9 +25,9 @@ #include <sys/types.h> #include "sd-event.h" -#include "journal-file.h" + #include "hashmap.h" -#include "audit.h" +#include "journal-file.h" #include "journald-rate-limit.h" #include "list.h" diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c index e68207ae07..dc4ac88712 100644 --- a/src/libsystemd/sd-bus/bus-control.c +++ b/src/libsystemd/sd-bus/bus-control.c @@ -32,7 +32,7 @@ #include "bus-internal.h" #include "bus-message.h" #include "bus-util.h" -#include "capability.h" +#include "capability-util.h" #include "string-util.h" #include "strv.h" #include "bus-control.h" diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c index d7a7b6e5bb..d291da8934 100644 --- a/src/libsystemd/sd-bus/bus-creds.c +++ b/src/libsystemd/sd-bus/bus-creds.c @@ -22,12 +22,12 @@ #include <linux/capability.h> #include <stdlib.h> -#include "audit.h" +#include "audit-util.h" #include "bus-creds.h" #include "bus-label.h" #include "bus-message.h" #include "bus-util.h" -#include "capability.h" +#include "capability-util.h" #include "cgroup-util.h" #include "fd-util.h" #include "fileio.h" diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c index 02c9ff8f2f..ab4e9cbc06 100644 --- a/src/libsystemd/sd-bus/bus-dump.c +++ b/src/libsystemd/sd-bus/bus-dump.c @@ -24,7 +24,7 @@ #include "bus-message.h" #include "bus-type.h" #include "cap-list.h" -#include "capability.h" +#include "capability-util.h" #include "fileio.h" #include "formats-util.h" #include "locale-util.h" diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c index 6f396b7953..a455259007 100644 --- a/src/libsystemd/sd-bus/bus-kernel.c +++ b/src/libsystemd/sd-bus/bus-kernel.c @@ -40,7 +40,7 @@ #include "bus-label.h" #include "bus-message.h" #include "bus-util.h" -#include "capability.h" +#include "capability-util.h" #include "fd-util.h" #include "fileio.h" #include "formats-util.h" diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 284ec42138..4204732e7d 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -26,7 +26,7 @@ #include "sd-messages.h" -#include "audit.h" +#include "audit-util.h" #include "bus-common-errors.h" #include "bus-error.h" #include "bus-util.h" diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 829b614509..26c135b2ca 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -30,7 +30,7 @@ #include "sd-messages.h" -#include "audit.h" +#include "audit-util.h" #include "bus-error.h" #include "bus-util.h" #include "escape.h" diff --git a/src/login/logind-utmp.c b/src/login/logind-utmp.c index 9c766bcb25..3f4a629be3 100644 --- a/src/login/logind-utmp.c +++ b/src/login/logind-utmp.c @@ -26,7 +26,7 @@ #include "sd-messages.h" -#include "audit.h" +#include "audit-util.h" #include "bus-common-errors.h" #include "bus-error.h" #include "bus-util.h" diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c index 464da88bcc..c37cfdb68b 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -30,7 +30,7 @@ #include <security/pam_modutil.h> #include <sys/file.h> -#include "audit.h" +#include "audit-util.h" #include "bus-common-errors.h" #include "bus-error.h" #include "bus-util.h" diff --git a/src/network/networkd.c b/src/network/networkd.c index 1a17847715..c03ac69e27 100644 --- a/src/network/networkd.c +++ b/src/network/networkd.c @@ -21,7 +21,7 @@ #include "sd-daemon.h" -#include "capability.h" +#include "capability-util.h" #include "networkd.h" #include "signal-util.h" #include "user-util.h" diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 4e9ac04094..28bca1f71e 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -51,7 +51,7 @@ #include "blkid-util.h" #include "btrfs-util.h" #include "cap-list.h" -#include "capability.h" +#include "capability-util.h" #include "cgroup-util.h" #include "copy.h" #include "dev-setup.h" diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c index df4eb6f63e..7ba0546f4a 100644 --- a/src/resolve/resolved.c +++ b/src/resolve/resolved.c @@ -22,7 +22,7 @@ #include "sd-daemon.h" #include "sd-event.h" -#include "capability.h" +#include "capability-util.h" #include "mkdir.h" #include "resolved-conf.h" #include "resolved-manager.h" diff --git a/src/shared/condition.c b/src/shared/condition.c index a79a74eaa5..a11054e316 100644 --- a/src/shared/condition.c +++ b/src/shared/condition.c @@ -29,7 +29,7 @@ #include "apparmor-util.h" #include "architecture.h" -#include "audit.h" +#include "audit-util.h" #include "cap-list.h" #include "condition.h" #include "extract-word.h" diff --git a/src/test/test-cap-list.c b/src/test/test-cap-list.c index 5f17868458..f43f737951 100644 --- a/src/test/test-cap-list.c +++ b/src/test/test-cap-list.c @@ -22,7 +22,7 @@ #include <sys/prctl.h> #include "cap-list.h" -#include "capability.h" +#include "capability-util.h" #include "fileio.h" #include "parse-util.h" #include "util.h" diff --git a/src/test/test-capability.c b/src/test/test-capability.c index 09d7e61e92..fc8d3ffe0d 100644 --- a/src/test/test-capability.c +++ b/src/test/test-capability.c @@ -24,7 +24,7 @@ #include <sys/wait.h> #include <unistd.h> -#include "capability.h" +#include "capability-util.h" #include "fd-util.h" #include "macro.h" #include "util.h" diff --git a/src/test/test-condition.c b/src/test/test-condition.c index 91a27138eb..365f5794d4 100644 --- a/src/test/test-condition.c +++ b/src/test/test-condition.c @@ -21,7 +21,7 @@ #include "apparmor-util.h" #include "architecture.h" -#include "audit.h" +#include "audit-util.h" #include "condition.h" #include "hostname-util.h" #include "ima-util.h" diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c index 59d348c356..7f70eaaea0 100644 --- a/src/timesync/timesyncd.c +++ b/src/timesync/timesyncd.c @@ -22,7 +22,7 @@ #include "sd-daemon.h" #include "sd-event.h" -#include "capability.h" +#include "capability-util.h" #include "clock-util.h" #include "fd-util.h" #include "fs-util.h" diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 9ac10db22a..7217f54611 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -40,7 +40,7 @@ #include "acl-util.h" #include "btrfs-util.h" -#include "capability.h" +#include "capability-util.h" #include "chattr-util.h" #include "conf-files.h" #include "copy.h" |