diff options
author | Lennart Poettering <lennart@poettering.net> | 2023-03-14 22:48:25 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2023-04-24 22:29:47 +0200 |
commit | 0593b34adcb79056767a5cfd70028a8222ee3cb7 (patch) | |
tree | df0de2a227d6f7d381aae4c2fd52cebd38292b38 /src/home/homework-mount.c | |
parent | Merge pull request #27113 from keszybz/variable-expansion-rework (diff) | |
download | systemd-0593b34adcb79056767a5cfd70028a8222ee3cb7.tar.xz systemd-0593b34adcb79056767a5cfd70028a8222ee3cb7.zip |
homed: rename make_userns() to avoid name conflict with mount-util.[ch]
This doesn't really matter too much as both are static functions. But
it's confusing as hell both when debugging and reading code, given that
homed actually uses mount-util.c
Hence, let's just rename one of the two, to minimize confusion.
No actual change in behaviour.
(and sooner or later we might want to export mount-util.c's version of
the function, since it's generically useful)
Diffstat (limited to 'src/home/homework-mount.c')
-rw-r--r-- | src/home/homework-mount.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/home/homework-mount.c b/src/home/homework-mount.c index cf42a0b94d..130617a157 100644 --- a/src/home/homework-mount.c +++ b/src/home/homework-mount.c @@ -184,7 +184,7 @@ static int append_identity_range(char **text, uid_t start, uid_t next_start, uid exclude + 1, exclude + 1, next_start - exclude - 1); } -static int make_userns(uid_t stored_uid, uid_t exposed_uid) { +static int make_home_userns(uid_t stored_uid, uid_t exposed_uid) { _cleanup_free_ char *text = NULL; _cleanup_close_ int userns_fd = -EBADF; int r; @@ -269,7 +269,7 @@ int home_shift_uid(int dir_fd, const char *target, uid_t stored_uid, uid_t expos return log_error_errno(errno, "Failed to open tree of home directory: %m"); } - userns_fd = make_userns(stored_uid, exposed_uid); + userns_fd = make_home_userns(stored_uid, exposed_uid); if (userns_fd < 0) return userns_fd; |