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 | 589645e2892df41b0acc5fed5073098a2bfab6a7 (patch) | |
| tree | 752386c16efdcce96b5dcde97d0ba7681f1b3ca6 | |
| parent | 492360f4ac483b5d0bff8961d5c7713700b55ab1 (diff) | |
| download | pw-darwin-589645e2892df41b0acc5fed5073098a2bfab6a7.tar.gz pw-darwin-589645e2892df41b0acc5fed5073098a2bfab6a7.tar.zst pw-darwin-589645e2892df41b0acc5fed5073098a2bfab6a7.zip | |
Fix handling of numeric-only names with pw lock
Add a regression test about it
PR: 204968
MFC after: 1 week
| -rw-r--r-- | pw/pw_user.c | 21 | ||||
| -rwxr-xr-x | pw/tests/pw_lock.sh | 20 |
2 files changed, 32 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); } diff --git a/pw/tests/pw_lock.sh b/pw/tests/pw_lock.sh index 9f14e24..5ec1b09 100755 --- a/pw/tests/pw_lock.sh +++ b/pw/tests/pw_lock.sh @@ -16,7 +16,27 @@ user_locking_body() { grep "^test:\*:1001:" $HOME/master.passwd } +atf_test_case numeric_locking cleanup +numeric_locking_body() { + populate_etc_skel + ${PW} useradd test || atf_fail "Creating test user" + ${PW} lock 1001 || atf_fail "Locking the user" + atf_check -s exit:0 -o match:"^test:\*LOCKED\*\*:1001:" \ + grep "^test:\*LOCKED\*\*:1001:" $HOME/master.passwd + ${PW} unlock 1001 || atf_fail "Unlocking the user" + atf_check -s exit:0 -o match:"^test:\*:1001:" \ + grep "^test:\*:1001:" $HOME/master.passwd + # Now numeric names + ${PW} useradd -n 1001 || atf_fail "Creating test user" + ${PW} lock 1001 || atf_fail "Locking the user" + atf_check -s exit:0 -o match:"^1001:\*LOCKED\*\*:1002:" \ + grep "^1001:\*LOCKED\*\*:1002:" $HOME/master.passwd + ${PW} unlock 1001 || atf_fail "Unlocking the user" + atf_check -s exit:0 -o match:"^1001:\*:1002:" \ + grep "^1001:\*:1002:" $HOME/master.passwd +} atf_init_test_cases() { atf_add_test_case user_locking + atf_add_test_case numeric_locking } |