]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
user-util: switch order of checks in valid_user_group_name_or_id_full()
authorLennart Poettering <lennart@poettering.net>
Mon, 30 Mar 2020 19:46:01 +0000 (21:46 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 31 Mar 2020 09:25:01 +0000 (11:25 +0200)
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

src/basic/user-util.c

index e998a46e72aea75e68754abe9c9a39528c0f317b..1510fc96ef955e9c47f274e4845743b653b13287 100644 (file)
@@ -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) {