dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-02 22:20:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

homed: rename make_userns() to avoid name conflict with mount-util.[ch]

Browse Source 
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)
This commit is contained in:
Lennart Poettering
2023-03-14 22:48:25 +01:00
parent 208a59c15f
commit 0593b34adc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/home/homework-mount.c
View File

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