core: rename credential.[ch] -> exec-credential.[ch]

Also rename setup_credentials() -> exec_setup_credentials().

Addresses the post-merge review
https://github.com/systemd/systemd/pull/28787#pullrequestreview-1592065048.

diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c
index 2a32063ddde25e92d2fd6db253f5745f801ed621..c1050b70304356e31a40947805e272556be680dc 100644 (file)
--- a/src/core/dbus-execute.c
+++ b/src/core/dbus-execute.c
@@ -9,13 +9,13 @@
 #include "cap-list.h"
 #include "capability-util.h"
 #include "cpu-set-util.h"
-#include "credential.h"
 #include "creds-util.h"
 #include "dbus-execute.h"
 #include "dbus-util.h"
 #include "env-util.h"
 #include "errno-list.h"
 #include "escape.h"
+#include "exec-credential.h"
 #include "execute.h"
 #include "fd-util.h"
 #include "fileio.h"

diff --git a/src/core/credential.c b/src/core/exec-credential.c
similarity index 99%
rename from src/core/credential.c
rename to src/core/exec-credential.c
index b8b8b4edaa7d6c3bb83bc2428567a16d0092776c..e7bab891b877b42e2a59b59dcc49ae1416ebdca4 100644 (file)
--- a/src/core/credential.c
+++ b/src/core/exec-credential.c
@@ -3,8 +3,8 @@
 #include <sys/mount.h>
 
 #include "acl-util.h"
-#include "credential.h"
 #include "creds-util.h"
+#include "exec-credential.h"
 #include "execute.h"
 #include "fileio.h"
 #include "glob-util.h"
@@ -871,7 +871,7 @@ static int setup_credentials_internal(
         return 0;
 }
 
-int setup_credentials(
+int exec_setup_credentials(
                 const ExecContext *context,
                 const ExecParameters *params,
                 const char *unit,

diff --git a/src/core/credential.h b/src/core/exec-credential.h
similarity index 98%
rename from src/core/credential.h
rename to src/core/exec-credential.h
index 54155f515bc5facdb5af5066566a0aa1cf216c50..db8e4ec3a523f8753cc1a54167ff927bbf7f9056 100644 (file)
--- a/src/core/credential.h
+++ b/src/core/exec-credential.h
@@ -40,7 +40,7 @@ bool exec_context_has_credentials(const ExecContext *c);
 int unit_add_default_credential_dependencies(Unit *u, const ExecContext *c);
 
 int exec_context_destroy_credentials(const ExecContext *c, const char *runtime_root, const char *unit);
-int setup_credentials(
+int exec_setup_credentials(
                 const ExecContext *context,
                 const ExecParameters *params,
                 const char *unit,

diff --git a/src/core/execute.c b/src/core/execute.c
index 14e196d4c7a6c33def1bb901cc0d710d8bb2aed0..81be3a642e4c09d3a6698ccfb1551a8da645590a 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -49,12 +49,12 @@
 #include "chown-recursive.h"
 #include "constants.h"
 #include "cpu-set-util.h"
-#include "credential.h"
 #include "data-fd-util.h"
 #include "env-file.h"
 #include "env-util.h"
 #include "errno-list.h"
 #include "escape.h"
+#include "exec-credential.h"
 #include "execute.h"
 #include "exit-status.h"
 #include "fd-util.h"
@@ -4427,7 +4427,7 @@ static int exec_child(
         }
 
         if (FLAGS_SET(params->flags, EXEC_WRITE_CREDENTIALS)) {
-                r = setup_credentials(context, params, unit->id, uid, gid);
+                r = exec_setup_credentials(context, params, unit->id, uid, gid);
                 if (r < 0) {
                         *exit_status = EXIT_CREDENTIALS;
                         return log_unit_error_errno(unit, r, "Failed to set up credentials: %m");

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 3c931568a0166cd4191cf2930923716ab007a125..cbc6da49af435412c3c645da47bff14428739776 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -28,11 +28,11 @@
 #include "conf-parser.h"
 #include "core-varlink.h"
 #include "cpu-set-util.h"
-#include "credential.h"
 #include "creds-util.h"
 #include "env-util.h"
 #include "errno-list.h"
 #include "escape.h"
+#include "exec-credential.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "fs-util.h"

diff --git a/src/core/meson.build b/src/core/meson.build
index 045ad31a5140f7c839c123a1b453c42621f0f454..12c7d7c6ed728b8aa5e9646a2f31aaa442b3109d 100644 (file)
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -11,7 +11,6 @@ libcore_sources = files(
         'bpf-socket-bind.c',
         'cgroup.c',
         'core-varlink.c',
-        'credential.c',
         'dbus-automount.c',
         'dbus-cgroup.c',
         'dbus-device.c',
@@ -35,6 +34,7 @@ libcore_sources = files(
         'dynamic-user.c',
         'efi-random.c',
         'emergency-action.c',
+        'exec-credential.c',
         'execute.c',
         'generator-setup.c',
         'ima-setup.c',

diff --git a/src/core/unit.c b/src/core/unit.c
index f1b27d30d3a1da0ec515b8149b1e089107218cb7..56af1253adb194e665056e4a1584683aa1f35b30 100644 (file)
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -20,12 +20,12 @@
 #include "cgroup-util.h"
 #include "chase.h"
 #include "core-varlink.h"
-#include "credential.h"
 #include "dbus-unit.h"
 #include "dbus.h"
 #include "dropin.h"
 #include "env-util.h"
 #include "escape.h"
+#include "exec-credential.h"
 #include "execute.h"
 #include "fd-util.h"
 #include "fileio-label.h"