- remove functions marked as LEGACY in SUSv3 and use their modern counterparts.

[oweals/busybox.git] / libbb / obscure.c

diff --git a/libbb/obscure.c b/libbb/obscure.c
index 7d839d62443a7bb8883d8d2c4296fce1a4aad189..2599095dfca23e0228b3432aadc236d74d12b50f 100644 (file)
--- 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;
 }