aboutsummaryrefslogtreecommitdiff
path: root/libbb/obscure.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-11-30 16:41:15 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-11-30 16:41:15 +0000
commitab24e18c7a32ee1637be19f239e9dd9d7c7f6534 (patch)
tree2646cfd66b5a8d279ad360aaa989a814eeecfd64 /libbb/obscure.c
parentb8bb27c7ea37c9885b1ded36d0f7807a09ede712 (diff)
downloadbusybox-ab24e18c7a32ee1637be19f239e9dd9d7c7f6534.tar.gz
passwd: rework:
* do not make backup copy by copying (just retain old file) * correctly fall back to /etc/passwd if user is not in shadow * fix bug with overlong passwd entries * be permissive on some kinds of failures * reduce stack usage * code size: -500 bytes
Diffstat (limited to 'libbb/obscure.c')
-rw-r--r--libbb/obscure.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libbb/obscure.c b/libbb/obscure.c
index 7d839d624..2599095df 100644
--- a/libbb/obscure.c
+++ b/libbb/obscure.c
@@ -157,14 +157,14 @@ static const char *obscure_msg(const char *old_p, const char *new_p, const struc
return NULL;
}
-int obscure(const char *old, const char *newval, const struct passwd *pwdp)
+int obscure(const char *old, const char *newval, const struct passwd *pw)
{
const char *msg;
- if ((msg = obscure_msg(old, newval, pwdp))) {
- printf("Bad password: %s.\n", msg);
- /* If user is root warn only */
- return getuid() ? 1 : 0;
+ msg = obscure_msg(old, newval, pw);
+ if (msg) {
+ printf("Bad password: %s\n", msg);
+ return 1;
}
return 0;
}