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

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.

diff --git a/Makefile.am b/Makefile.am
index dada6cd85f3587bd0ee4b5134e7dce28b1fbbb1e..d435141492c6966d3477898653c79109e36175ce 100644 (file)
--- 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
similarity index 99%
rename from src/basic/audit.c
rename to src/basic/audit-util.c
index 4957fc1bec15376b26a42a769aeacc6dcdabd559..93d1adaf99d556e509fe7af3173cc152d9f7fbb6 100644 (file)
--- 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
similarity index 100%
rename from src/basic/audit.h
rename to src/basic/audit-util.h

diff --git a/src/basic/capability.c b/src/basic/capability-util.c
similarity index 99%
rename from src/basic/capability.c
rename to src/basic/capability-util.c
index 04c7047a6af9795c3df88eddb7bc836aba6f0766..3a6ceed6f5132a995facc312072c30b7418462d7 100644 (file)
--- 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
similarity index 100%
rename from src/basic/capability.h
rename to src/basic/capability-util.h

diff --git a/src/bus-proxyd/bus-proxyd.c b/src/bus-proxyd/bus-proxyd.c
index 7e7574568c1dfc38cae1da3f77b236b27fd8da96..fc8edaeb36c47443e948b38164ba1ebb831bff37 100644 (file)
--- 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 950e463bc5aa49da563edd20f09fd9ff3eb6df1f..35f1b2913be00257091fc2413f6b7db3a3e798b2 100644 (file)
--- 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 f3542163252bc3882359548ae22026451710ae84..2982125b824863a30dbadc752c4d7fcc8aeae899 100644 (file)
--- 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 2068ffd69b2008e0d506271e75485502e10b430d..651f79a1fe5cbc086bcd3eed782d14908a9eefc6 100644 (file)
--- 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 3e4e9199ed6510f1087d6f8c5fac6211c7d09d4c..fd8ad0c0eacc54eabff04c96227b1937086c81c2 100644 (file)
--- 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 d96a000f816b0764d879e4a723725f3e65694860..a8551ca9e8630a33499398136175ab94b00ff173 100644 (file)
--- 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 17283a4a24fcfc7ba09b0ebd952748c8130a417a..f9c168e37472c4154c428c972f29917ba375840e 100644 (file)
--- 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 257a665819a4f0a3b2e49cd18eba915f1bdcbd04..b9ece73a812a92145c2e1abf243a1d1e9646f8bb 100644 (file)
--- 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 ab213f705dacd7173fcdb1fc93f5dc988812834b..442fbb8ecd3258a6f482c0ddc2f052713ca6b8c1 100644 (file)
--- 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 535c0ab9ab25525f70ca4b4c9720f313dc8eda18..a2631c6017573f1881f73c8520cc7bc272483a5e 100644 (file)
--- 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 e68207ae07e2830e14c453d149cea1f6bfbea4ae..dc4ac88712cba4e71c1410ee70f120d38a6bbded 100644 (file)
--- 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 d7a7b6e5bbc309ba3d393ccbb82619c85421a5aa..d291da8934bd45b783036c6839e432825cdcd7c4 100644 (file)
--- 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 02c9ff8f2f8d5ef55fc628889202502ae6f6f7fc..ab4e9cbc06fc7e1dc7035b7e933fb7361ffb8b8e 100644 (file)
--- 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 6f396b795310c58d78ad8ce334727dd4cb515218..a455259007947dba4e66a97c969d316110dd86a8 100644 (file)
--- 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 284ec421380f0c6bc64d72f00d1ef3a76d071c68..4204732e7d933f33a90bc39c47239d6a800fc1e2 100644 (file)
--- 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 829b614509586e891efa5735d85172b0ef7e907f..26c135b2ca6b1e5a6f890f337ab60d94a20d0256 100644 (file)
--- 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 9c766bcb25efc6f0e2b4a139f86fc292421ac228..3f4a629be35c88d39cd1333ab415a74a05921be2 100644 (file)
--- 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 464da88bccbff9162e0b468c99ae1b083de48a87..c37cfdb68b02dd870c94f53c616d30eb8eb19662 100644 (file)
--- 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 1a178477158478a47c4278331565944d53762026..c03ac69e277de0ce32cd39cc479813d1da722331 100644 (file)
--- 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 4e9ac040949793297ff220c07bd59fd20538221f..28bca1f71eed1a9e544bece2cfe0339681af5a2a 100644 (file)
--- 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 df4eb6f63e2747a136cc8996c509d3ab949b9075..7ba0546f4a8b698ba80d87079f32d33dd79be682 100644 (file)
--- 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 a79a74eaa5193888c60206bf25cf213553b95992..a11054e31662f40ec9087e307fdbe108b8667e04 100644 (file)
--- 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 5f178684588fd1a9fabec54f1eca2c1875b3236b..f43f73795176e414aed218845ac6988dcd9a3768 100644 (file)
--- 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 09d7e61e9206a47cff90e27211e2b8456799812f..fc8d3ffe0d2bb4200874928cb75ff6c52015f670 100644 (file)
--- 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 91a27138eb26c453a0c63285179b4aa106af7c3f..365f5794d434fb043a85a22c530c36eff4c60970 100644 (file)
--- 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 59d348c3569558cf9e2eac7ee538e6cffac5923c..7f70eaaea0f8d93a421d54dd1e1693bae5e8ce02 100644 (file)
--- 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 9ac10db22a2854e0ba7d7048d389231d3d8b3e70..7217f546112fe3e5dd0b413c2ab59d298eaf56b7 100644 (file)
--- 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"