summaryrefslogtreecommitdiffstats
path: root/chpass
diff options
context:
space:
mode:
authorDmitry Morozovsky <marck@FreeBSD.org>2006-09-25 15:06:24 +0000
committerDmitry Morozovsky <marck@FreeBSD.org>2006-09-25 15:06:24 +0000
commit427db8b9ab1ccae1a6470c8fbb5454b3c9860cfa (patch)
tree6b429856e913baca3ed3e5f5224c06e3c7890b89 /chpass
parent24ff634fd13a71903656e19459afba2fc06d6122 (diff)
downloadpw-darwin-427db8b9ab1ccae1a6470c8fbb5454b3c9860cfa.tar.gz
pw-darwin-427db8b9ab1ccae1a6470c8fbb5454b3c9860cfa.tar.zst
pw-darwin-427db8b9ab1ccae1a6470c8fbb5454b3c9860cfa.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
Diffstat (limited to 'chpass')
-rw-r--r--chpass/chpass.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/chpass/chpass.c b/chpass/chpass.c
index ad6b985..2504e68 100644
--- a/chpass/chpass.c
+++ b/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");
}