diff options
| author | Dmitry Morozovsky <marck@FreeBSD.org> | 2006-09-25 15:06:24 +0000 |
|---|---|---|
| committer | Dmitry Morozovsky <marck@FreeBSD.org> | 2006-09-25 15:06:24 +0000 |
| commit | 50789a2f3a91ff26e04446c9e51a77a0fcd930fa (patch) | |
| tree | 545ced6df72b6efe4c40f976ad0fb16bdd1ca312 /usr.bin/chpass | |
| parent | d038d0bd6679b07ae4f68628febb02f25e5d9a4e (diff) | |
| download | src-50789a2f3a91ff26e04446c9e51a77a0fcd930fa.tar.gz src-50789a2f3a91ff26e04446c9e51a77a0fcd930fa.zip | |
Fix bug introduced in rev 1.23:
pw_equal does not check crypted password field, so one cannot change
crypted password keeping other fields intact.
Approved by: des
MCF after: 3 days
Notes
Notes:
svn path=/head/; revision=162633
Diffstat (limited to 'usr.bin/chpass')
| -rw-r--r-- | usr.bin/chpass/chpass.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/chpass/chpass.c b/usr.bin/chpass/chpass.c index ad6b9850370d..2504e68ec17d 100644 --- a/usr.bin/chpass/chpass.c +++ b/usr.bin/chpass/chpass.c @@ -217,7 +217,12 @@ main(int argc, char *argv[]) pw_fini(); if (pw == NULL) err(1, "edit()"); - if (pw_equal(old_pw, pw)) + /* + * pw_equal does not check for crypted passwords, so we + * should do it explicitly + */ + if (pw_equal(old_pw, pw) && + strcmp(old_pw->pw_passwd, pw->pw_passwd) == 0) errx(0, "user information unchanged"); } |