From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 10 Mar 2025 10:33:50 +0000 (+0100)
Subject: namespace: simplify apply_one_mount() a bit
X-Git-Tag: v258-rc1~1062^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c9327e353d974523d5a9383d3dd67b423be2a98;p=thirdparty%2Fsystemd.git

namespace: simplify apply_one_mount() a bit

Drop a bunch of unnecessary casts, format strings, and {} blocks.
---

diff --git a/src/core/namespace.c b/src/core/namespace.c
index 0943e0818fa..64f773b2c29 100644
--- a/src/core/namespace.c
+++ b/src/core/namespace.c
@@ -1899,23 +1899,21 @@ static int apply_one_mount(
                 log_debug("Setting an id-mapped mount on %s", mount_entry_path(m));
 
                 /* Do mapping from nobody (in setup_exec_directory()) -> this uid */
-                if (strextendf(&uid_map, UID_FMT " " UID_FMT " " UID_FMT "\n", UID_NOBODY, (uid_t)m->idmap_uid, (uid_t)1u) < 0)
+                if (strextendf(&uid_map, UID_FMT " " UID_FMT " 1\n", UID_NOBODY, m->idmap_uid) < 0)
                         return log_oom();
 
                 /* Consider StateDirectory=xxx aaa xxx:aaa/222
                  * To allow for later symlink creation (by root) in create_symlinks_from_tuples(), map root as well. */
-                if (m->idmap_uid != (uid_t)0) {
-                        if (strextendf(&uid_map, UID_FMT " " UID_FMT " " UID_FMT "\n", (uid_t)0, (uid_t)0, (uid_t)1u) < 0)
+                if (m->idmap_uid != 0)
+                        if (!strextend(&uid_map, "0 0 1\n"))
                                 return log_oom();
-                }
 
-                if (strextendf(&gid_map, GID_FMT " " GID_FMT " " GID_FMT "\n", GID_NOBODY, (gid_t)m->idmap_gid, (gid_t)1u) < 0)
+                if (strextendf(&gid_map, GID_FMT " " GID_FMT " 1\n", GID_NOBODY, m->idmap_gid) < 0)
                         return log_oom();
 
-                if (m->idmap_gid != (gid_t)0) {
-                        if (strextendf(&gid_map, GID_FMT " " GID_FMT " " GID_FMT "\n", (gid_t)0, (gid_t)0, (gid_t)1u) < 0)
+                if (m->idmap_gid != 0)
+                        if (!strextend(&gid_map, "0 0 1\n"))
                                 return log_oom();
-                }
 
                 userns_fd = userns_acquire(uid_map, gid_map, /* setgroups_deny= */ true);
                 if (userns_fd < 0)