From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 20 Feb 2025 14:07:30 +0000 (+0100)
Subject: user-runtime-dir: use right accessor got get GID of account
X-Git-Tag: v258-rc1~1291
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3adb7cd635260c459e8732dd5e45fe2213f1222;p=thirdparty%2Fsystemd.git

user-runtime-dir: use right accessor got get GID of account
---

diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c
index 3b5d46a0c9b..fb33fdd9397 100644
--- a/src/login/user-runtime-dir.c
+++ b/src/login/user-runtime-dir.c
@@ -137,7 +137,7 @@ static int do_mount(UserRecord *ur) {
 
         assert(ur);
 
-        if (!uid_is_valid(ur->uid) || !gid_is_valid(ur->gid))
+        if (!uid_is_valid(ur->uid) || !gid_is_valid(user_record_gid(ur)))
                 return log_error_errno(SYNTHETIC_ERRNO(ENOMSG), "User '%s' lacks UID or GID, refusing.", ur->user_name);
 
         uint64_t runtime_dir_size, runtime_dir_inodes;
@@ -148,8 +148,8 @@ static int do_mount(UserRecord *ur) {
         char runtime_path[STRLEN("/run/user/") + DECIMAL_STR_MAX(uid_t)];
         xsprintf(runtime_path, "/run/user/" UID_FMT, ur->uid);
 
-        log_debug("Will mount %s owned by "UID_FMT":"GID_FMT, runtime_path, ur->uid, ur->gid);
-        return user_mkdir_runtime_path(runtime_path, ur->uid, ur->gid, runtime_dir_size, runtime_dir_inodes);
+        log_debug("Will mount %s owned by "UID_FMT":"GID_FMT, runtime_path, ur->uid, user_record_gid(ur));
+        return user_mkdir_runtime_path(runtime_path, ur->uid, user_record_gid(ur), runtime_dir_size, runtime_dir_inodes);
 }
 
 static int user_remove_runtime_path(const char *runtime_path) {