summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2007-07-26 17:48:42 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2007-07-26 17:48:42 +0000
commit23a7bb24f647927a81f48d6a4aba77218aeeca04 (patch)
treed53c93dfffd572b04c7bec7dbf926eb99f2922a0 /usr.bin
parentab34ecd4bf73a94563b7137eb67e540192eedf1a (diff)
Remove the space after "Password:" in password prompts where echo is
turned off. This is consistent with historic UNIX behavior.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ftp/cmds.c6
-rw-r--r--usr.bin/passwd/krb5_passwd.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ftp/cmds.c b/usr.bin/ftp/cmds.c
index e90558b2772..e0b73fab19c 100644
--- a/usr.bin/ftp/cmds.c
+++ b/usr.bin/ftp/cmds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmds.c,v 1.55 2006/11/22 04:08:35 ray Exp $ */
+/* $OpenBSD: cmds.c,v 1.56 2007/07/26 17:48:41 millert Exp $ */
/* $NetBSD: cmds.c,v 1.27 1997/08/18 10:20:15 lukem Exp $ */
/*
@@ -60,7 +60,7 @@
*/
#if !defined(lint) && !defined(SMALL)
-static const char rcsid[] = "$OpenBSD: cmds.c,v 1.55 2006/11/22 04:08:35 ray Exp $";
+static const char rcsid[] = "$OpenBSD: cmds.c,v 1.56 2007/07/26 17:48:41 millert Exp $";
#endif /* not lint and not SMALL */
/*
@@ -1267,7 +1267,7 @@ user(int argc, char *argv[])
n = command("USER %s", argv[1]);
if (n == CONTINUE) {
if (argc < 3 )
- argv[2] = getpass("Password: "), argc++;
+ argv[2] = getpass("Password:"), argc++;
n = command("PASS %s", argv[2]);
}
if (n == CONTINUE) {
diff --git a/usr.bin/passwd/krb5_passwd.c b/usr.bin/passwd/krb5_passwd.c
index 2f608c28ae9..5f25f44afff 100644
--- a/usr.bin/passwd/krb5_passwd.c
+++ b/usr.bin/passwd/krb5_passwd.c
@@ -111,7 +111,7 @@ krb5_passwd(int argc, char **argv)
krb5_data_zero(&result_code_string);
krb5_data_zero(&result_string);
- if (des_read_pw_string(pwbuf, sizeof(pwbuf), "New password: ", 1) != 0)
+ if (des_read_pw_string(pwbuf, sizeof(pwbuf), "New password:", 1) != 0)
return 1;
ret = krb5_change_password (context, &cred, pwbuf, &result_code,