src/basic: rename audit.[ch] → audit-util.[ch] and capability.[ch] → capability-util.[ch]

The files are named too generically, so that they might conflict with
the upstream project headers. Hence, let's add a "-util" suffix, to
clarify that this are just our utility headers and not any official
upstream headers.

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 \

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"