diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-03-30 21:46:01 +0200 |
|---|---|---|
| committer | The Plumber <50238977+systemd-rhel-bot@users.noreply.github.com> | 2020-11-02 19:05:19 +0100 |
| commit | 7569168bea3d7e11cd3afe6167fcf4a3ac65a1a6 (patch) | |
| tree | 1015388f8b2559779e94852570e5d65f026b325b | |
| parent | 40dff18947fa198810db4cd3e5291349fc84a0e8 (diff) | |
| download | systemd-7569168bea3d7e11cd3afe6167fcf4a3ac65a1a6.tar.gz | |
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
(cherry picked from commit a85daa0dfb3eb03be9845760e90e54b9af8fb00e)
Related: #1848373
| -rw-r--r-- | src/basic/user-util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/basic/user-util.c b/src/basic/user-util.c index 7dd2bb2c84..68a924770b 100644 --- a/src/basic/user-util.c +++ b/src/basic/user-util.c @@ -656,10 +656,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) { |