From 19782a72b4e7b8dfa5114add9463c08e1da3a769 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Fri, 10 Jul 2026 03:46:54 -0700 Subject: [PATCH 1/2] user: fix a comment in GetExecUser Fix variable names in the comment (broken by commit 07dccc2). Signed-off-by: Kir Kolyshkin --- user/user.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/user.go b/user/user.go index 14b0b41..7ba17a4 100644 --- a/user/user.go +++ b/user/user.go @@ -303,7 +303,7 @@ func GetExecUser(userSpec string, defaults *ExecUser, passwd, group io.Reader) ( // Allow for userSpec to have either "user", or optionally "user:group" syntax. usr, grp, _ := strings.Cut(userSpec, ":") - // Convert userArg and groupArg to be numeric, so we don't have to execute + // Convert usr and grp to be numeric, so we don't have to execute // Atoi *twice* for each iteration over lines. userArg, err := parseUserArg(usr) if err != nil { From 743614ec8aec7c62839dd3acf615da4e4de560d6 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Fri, 10 Jul 2026 03:48:52 -0700 Subject: [PATCH 2/2] user: use parseGroupArg in GetAdditionalGroups Signed-off-by: Kir Kolyshkin --- user/user.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/user/user.go b/user/user.go index 7ba17a4..d36d06b 100644 --- a/user/user.go +++ b/user/user.go @@ -399,17 +399,13 @@ func GetExecUser(userSpec string, defaults *ExecUser, passwd, group io.Reader) ( // or the given group data is nil, the id will be returned as-is // provided it is in the legal range. func GetAdditionalGroups(additionalGroups []string, group io.Reader) ([]int, error) { - addtlGroups := make([]groupArg, len(additionalGroups)) - for i, ag := range additionalGroups { - gid, ok, err := parseNumeric(ag) + addtlGroups := make([]groupArg, 0, len(additionalGroups)) + for _, ag := range additionalGroups { + groupArg, err := parseGroupArg(ag) if err != nil { return nil, err } - addtlGroups[i] = groupArg{ - name: ag, - gid: gid, - isNumeric: ok, - } + addtlGroups = append(addtlGroups, *groupArg) } groups := []Group{}