aboutsummaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-09-06 19:02:46 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-09-06 19:02:46 +0000
commit6d655be5df5a559253a3769f294a6255535ad3fd (patch)
tree4342fd4f88b84459ef5c2c2c2c6fb86863a7112f /loginutils
parent3538b9a8822421b7c8596a33a917dcf2f99c92b7 (diff)
downloadbusybox-6d655be5df5a559253a3769f294a6255535ad3fd.tar.gz
removed a lot of trailing \n in bb_msg() calls. It is added
automatically by function itself.
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/passwd.c10
-rw-r--r--loginutils/sulogin.c6
2 files changed, 8 insertions, 8 deletions
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index aa75dd260..b0770e65c 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.c
@@ -170,11 +170,11 @@ int passwd_main(int argc, char **argv)
}
pw = getpwnam(name);
if (!pw) {
- bb_error_msg_and_die("Unknown user %s\n", name);
+ bb_error_msg_and_die("Unknown user %s", name);
}
if (!amroot && pw->pw_uid != getuid()) {
syslog(LOG_WARNING, "can't change pwd for `%s'", name);
- bb_error_msg_and_die("Permission denied.\n");
+ bb_error_msg_and_die("Permission denied.");
}
if (ENABLE_FEATURE_SHADOWPASSWDS) {
struct spwd *sp = getspnam(name);
@@ -188,12 +188,12 @@ int passwd_main(int argc, char **argv)
if (!amroot) {
if (cp[0] == '!') {
syslog(LOG_WARNING, "password locked for `%s'", np);
- bb_error_msg_and_die( "The password for `%s' cannot be changed.\n", np);
+ bb_error_msg_and_die( "The password for `%s' cannot be changed.", np);
}
}
printf("Changing password for %s\n", name);
if (new_password(pw, amroot, algo)) {
- bb_error_msg_and_die( "The password for %s is unchanged.\n", name);
+ bb_error_msg_and_die( "The password for %s is unchanged.", name);
}
} else if (lflg) {
if (crypt_passwd[0] != '!') {
@@ -222,7 +222,7 @@ int passwd_main(int argc, char **argv)
printf("Password changed.\n");
} else {
syslog(LOG_WARNING, "an error occurred updating the password file");
- bb_error_msg_and_die("An error occurred updating the password file.\n");
+ bb_error_msg_and_die("An error occurred updating the password file.");
}
if (ENABLE_FEATURE_CLEAN_UP) free(myname);
return (0);
diff --git a/loginutils/sulogin.c b/loginutils/sulogin.c
index b7e3f6fbf..1c49d324d 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -99,7 +99,7 @@ int sulogin_main(int argc, char **argv)
}
if (access(bb_path_passwd_file, 0) == -1) {
syslog(LOG_WARNING, "No password file\n");
- bb_error_msg_and_die("No password file\n");
+ bb_error_msg_and_die("No password file");
}
if (!isatty(0) || !isatty(1) || !isatty(2)) {
exit(EXIT_FAILURE);
@@ -113,8 +113,8 @@ int sulogin_main(int argc, char **argv)
signal(SIGALRM, catchalarm);
if (!(pwd = getpwnam(name))) {
- syslog(LOG_WARNING, "No password entry for `root'\n");
- bb_error_msg_and_die("No password entry for `root'\n");
+ syslog(LOG_WARNING, "No password entry for `root'");
+ bb_error_msg_and_die("No password entry for `root'");
}
pwent = *pwd;
#if ENABLE_FEATURE_SHADOWPASSWDS