diff options
| author |   Baptiste Daroussin <bapt@FreeBSD.org> | 2015-12-02 22:01:37 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-12-02 22:01:37 +0000 |
| commit | 42c74a30927e0f5a7c28809ed3df548911bf17a1 (patch) | |
| tree | 13f99dc6141b8c249bb5e0414cbb265ca2b5f176 /pw | |
| parent | 53d5541556909952101aae809c6d30717ab497d0 (diff) | |
| download | pw-darwin-42c74a30927e0f5a7c28809ed3df548911bf17a1.tar.gz pw-darwin-42c74a30927e0f5a7c28809ed3df548911bf17a1.tar.zst pw-darwin-42c74a30927e0f5a7c28809ed3df548911bf17a1.zip | |
Fix handling of numeric-only names with pw lock
Add a regression test about it
PR: 204968
MFC after: 1 week
Diffstat (limited to 'pw')
| -rw-r--r-- | pw/pw_user.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pw/pw_user.c b/pw/pw_user.c index 5c168ab..61c2440 100644 --- a/pw/pw_user.c +++ b/pw/pw_user.c @@ -274,7 +274,7 @@ pw_userlock(char *arg1, int mode) char *passtmp = NULL; char *name; bool locked = false; - uid_t id; + uid_t id = (uid_t)-1; if (geteuid() != 0) errx(EX_NOPERM, "you must be root"); @@ -282,16 +282,19 @@ pw_userlock(char *arg1, int mode) if (arg1 == NULL) errx(EX_DATAERR, "username or id required"); - if (arg1[strspn(arg1, "0123456789")] == '\0') { - id = pw_checkid(arg1, UID_MAX); - name = NULL; - } else - name = arg1; + name = arg1; + if (arg1[strspn(name, "0123456789")] == '\0') + id = pw_checkid(name, UID_MAX); - pwd = (name != NULL) ? GETPWNAM(pw_checkname(name, 0)) : GETPWUID(id); + pwd = GETPWNAM(pw_checkname(name, 0)); + if (pwd == NULL && id != (uid_t)-1) { + pwd = GETPWUID(id); + if (pwd != NULL) + name = pwd->pw_name; + } if (pwd == NULL) { - if (name == NULL) - errx(EX_NOUSER, "no such uid `%ju'", (uintmax_t) id); + if (id == (uid_t)-1) + errx(EX_NOUSER, "no such name or uid `%ju'", (uintmax_t) id); errx(EX_NOUSER, "no such user `%s'", name); } |