summaryrefslogtreecommitdiff
path: root/loginutils
diff options
context:
space:
mode:
authorDenis Vlasenko2006-09-23 13:11:49 +0000
committerDenis Vlasenko2006-09-23 13:11:49 +0000
commita36a676923a674e35aae65faaa169fab9d765023 (patch)
treec99eb90ceea7adfebc157ca28a45cf9ae81b4a57 /loginutils
parent7f1f5b001f5a0dee058024f7bee04dced38877df (diff)
downloadbusybox-a36a676923a674e35aae65faaa169fab9d765023.zip
busybox-a36a676923a674e35aae65faaa169fab9d765023.tar.gz
correct_password: undo whitespace damage.
vlock + correct_password: fix incorrect line breaks in messages.
Diffstat (limited to 'loginutils')
-rw-r--r--loginutils/su.c2
-rw-r--r--loginutils/vlock.c7
2 files changed, 4 insertions, 5 deletions
diff --git a/loginutils/su.c b/loginutils/su.c
index ff6643e..c51359a 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -45,7 +45,7 @@ int su_main(int argc, char **argv)
}
pw = getpwnam(opt_username);
- if (!pw) bb_error_msg_and_die("Unknown id: %s", opt_username);
+ if (!pw) bb_error_msg_and_die("unknown id: %s", opt_username);
/* Make sure pw->pw_shell is non-NULL. It may be NULL when NEW_USER
is a username that is retrieved via NIS (YP), but that doesn't have
diff --git a/loginutils/vlock.c b/loginutils/vlock.c
index b4426ad..564b6d5 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -108,13 +108,12 @@ int vlock_main(int argc, char **argv)
tcsetattr(STDIN_FILENO, TCSANOW, &term);
do {
- printf("Virtual Console%s locked.\n%s's ", (o_lock_all) ? "s" : "", pw->pw_name);
- fflush(stdout);
- if (correct_password (pw)) {
+ printf("Virtual Console%s locked. Enter %s's password to unlock\n", (o_lock_all) ? "s" : "", pw->pw_name);
+ if (correct_password(pw)) {
break;
}
bb_do_delay(FAIL_DELAY);
- puts("Password incorrect.");
+ puts("Password incorrect");
} while (1);
restore_terminal();
return 0;