From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 30 Mar 2020 19:46:01 +0000 (+0200)
Subject: user-util: switch order of checks in valid_user_group_name_or_id_full()
X-Git-Tag: v246-rc1~675
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a85daa0dfb3eb03be9845760e90e54b9af8fb00e;p=thirdparty%2Fsystemd.git

user-util: switch order of checks in valid_user_group_name_or_id_full()

When we are supposed to accept numeric UIDs formatted as string, then
let's check that first, before passing things on to
valid_user_group_name_full(), since that might log about, and not the
other way round.

See: #15201
Follow-up for: 93c23c9297e48e594785e0bb9c51504aae5fbe3e
---

diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index e998a46e72a..1510fc96ef9 100644
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -778,10 +778,10 @@ bool valid_user_group_name_or_id_full(const char *u, bool strict) {
         if (isempty(u))
                 return false;
 
-        if (valid_user_group_name_full(u, strict))
+        if (parse_uid(u, NULL) >= 0)
                 return true;
 
-        return parse_uid(u, NULL) >= 0;
+        return valid_user_group_name_full(u, strict);
 }
 
 bool valid_gecos(const char *d) {