/*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-
#include "libbb.h"
#include <syslog.h>
if (myuid && pw->pw_passwd[0]) {
char *encrypted;
- orig = bb_ask_stdin("Old password:"); /* returns ptr to static */
+ orig = bb_ask_stdin("Old password: "); /* returns ptr to static */
if (!orig)
goto err_ret;
encrypted = pw_encrypt(orig, pw->pw_passwd, 1); /* returns malloced str */
if (ENABLE_FEATURE_CLEAN_UP) free(encrypted);
}
orig = xstrdup(orig); /* or else bb_ask_stdin() will destroy it */
- newp = bb_ask_stdin("New password:"); /* returns ptr to static */
+ newp = bb_ask_stdin("New password: "); /* returns ptr to static */
if (!newp)
goto err_ret;
newp = xstrdup(newp); /* we are going to bb_ask_stdin() again, so save it */
&& obscure(orig, newp, pw) && myuid)
goto err_ret; /* non-root is not allowed to have weak passwd */
- cp = bb_ask_stdin("Retype password:");
+ cp = bb_ask_stdin("Retype password: ");
if (!cp)
goto err_ret;
if (strcmp(cp, newp)) {
#endif
logmode = LOGMODE_BOTH;
- openlog(applet_name, LOG_NOWAIT, LOG_AUTH);
+ openlog(applet_name, 0, LOG_AUTH);
opt = getopt32(argv, "a:lud", &opt_a);
//argc -= optind;
argv += optind;
myname = xstrdup(xuid2uname(myuid));
name = argv[0] ? argv[0] : myname;
- pw = getpwnam(name);
- if (!pw)
- bb_error_msg_and_die("unknown user %s", name);
+ pw = xgetpwnam(name);
if (myuid && pw->pw_uid != myuid) {
/* LOGMODE_BOTH */
bb_error_msg_and_die("%s can't change password for %s", myname, name);
if (!(opt & OPT_lud)) {
if (myuid && !c) { /* passwd starts with '!' */
/* LOGMODE_BOTH */
- bb_error_msg_and_die("cannot change "
+ bb_error_msg_and_die("can't change "
"locked password for %s", name);
}
printf("Changing password for %s\n", name);
#if ENABLE_FEATURE_SHADOWPASSWDS
filename = bb_path_shadow_file;
- rc = update_passwd(bb_path_shadow_file, name, newp);
+ rc = update_passwd(bb_path_shadow_file, name, newp, NULL);
if (rc == 0) /* no lines updated, no errors detected */
#endif
{
filename = bb_path_passwd_file;
- rc = update_passwd(bb_path_passwd_file, name, newp);
+ rc = update_passwd(bb_path_passwd_file, name, newp, NULL);
}
/* LOGMODE_BOTH */
if (rc < 0)
- bb_error_msg_and_die("cannot update password file %s",
+ bb_error_msg_and_die("can't update password file %s",
filename);
bb_info_msg("Password for %s changed by %s", name, myname);