projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stty: fix columns command. closes bug 791.
[oweals/busybox.git]
/
loginutils
/
passwd.c
diff --git
a/loginutils/passwd.c
b/loginutils/passwd.c
index aa89b87a755b14ce9f1ca6eba17ffd61ba0eab1d..c1481c65ee8f0c9e854c86fcd8d18b96929340aa 100644
(file)
--- a/
loginutils/passwd.c
+++ b/
loginutils/passwd.c
@@
-2,7
+2,6
@@
/*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
/*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-
#include "libbb.h"
#include <syslog.h>
#include "libbb.h"
#include <syslog.h>
@@
-22,7
+21,7
@@
static char* new_password(const struct passwd *pw, uid_t myuid, int algo)
if (myuid && pw->pw_passwd[0]) {
char *encrypted;
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 (!orig)
goto err_ret;
encrypted = pw_encrypt(orig, pw->pw_passwd, 1); /* returns malloced str */
@@
-36,7
+35,7
@@
static char* new_password(const struct passwd *pw, uid_t myuid, int algo)
if (ENABLE_FEATURE_CLEAN_UP) free(encrypted);
}
orig = xstrdup(orig); /* or else bb_ask_stdin() will destroy it */
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 */
if (!newp)
goto err_ret;
newp = xstrdup(newp); /* we are going to bb_ask_stdin() again, so save it */
@@
-44,7
+43,7
@@
static char* new_password(const struct passwd *pw, uid_t myuid, int algo)
&& obscure(orig, newp, pw) && myuid)
goto err_ret; /* non-root is not allowed to have weak passwd */
&& 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)) {
if (!cp)
goto err_ret;
if (strcmp(cp, newp)) {
@@
-100,7
+99,7
@@
int passwd_main(int argc UNUSED_PARAM, char **argv)
#endif
logmode = LOGMODE_BOTH;
#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;
opt = getopt32(argv, "a:lud", &opt_a);
//argc -= optind;
argv += optind;
@@
-147,7
+146,7
@@
int passwd_main(int argc UNUSED_PARAM, char **argv)
if (!(opt & OPT_lud)) {
if (myuid && !c) { /* passwd starts with '!' */
/* LOGMODE_BOTH */
if (!(opt & OPT_lud)) {
if (myuid && !c) { /* passwd starts with '!' */
/* LOGMODE_BOTH */
- bb_error_msg_and_die("can
no
t change "
+ bb_error_msg_and_die("can
'
t change "
"locked password for %s", name);
}
printf("Changing password for %s\n", name);
"locked password for %s", name);
}
printf("Changing password for %s\n", name);
@@
-181,16
+180,16
@@
int passwd_main(int argc UNUSED_PARAM, char **argv)
#if ENABLE_FEATURE_SHADOWPASSWDS
filename = bb_path_shadow_file;
#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;
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)
}
/* LOGMODE_BOTH */
if (rc < 0)
- bb_error_msg_and_die("can
no
t 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);
filename);
bb_info_msg("Password for %s changed by %s", name, myname);