From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 14 Mar 2023 21:48:25 +0000 (+0100)
Subject: homed: rename make_userns() to avoid name conflict with mount-util.[ch]
X-Git-Tag: v254-rc1~653
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0593b34adcb79056767a5cfd70028a8222ee3cb7;p=thirdparty%2Fsystemd.git

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)
---

diff --git a/src/home/homework-mount.c b/src/home/homework-mount.c
index cf42a0b94df..130617a157f 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;