shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

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

Browse Source 
Also rename setup_credentials() -> exec_setup_credentials().

Addresses the post-merge review
https://github.com/systemd/systemd/pull/28787#pullrequestreview-1592065048.
This commit is contained in:
Yu Watanabe 2023-08-24 23:52:51 +09:00
parent 73ff4d48de
commit 43962c30fb
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/dbus-execute.c
View File

@ -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"

4
src/core/credential.c → src/core/exec-credential.c
View File

@ -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,

2
src/core/credential.h → src/core/exec-credential.h
View File

@ -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,

4
src/core/execute.c
View File

@ -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");

2
src/core/load-fragment.c
View File

@ -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"

2
src/core/meson.build
View File

@ -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',

2
src/core/unit.c
View File

@ -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"