From 23a7bb24f647927a81f48d6a4aba77218aeeca04 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Thu, 26 Jul 2007 17:48:42 +0000 Subject: Remove the space after "Password:" in password prompts where echo is turned off. This is consistent with historic UNIX behavior. --- libexec/login_skey/login_skey.c | 6 +++--- libexec/login_tis/login_tis.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libexec') diff --git a/libexec/login_skey/login_skey.c b/libexec/login_skey/login_skey.c index 396babea0b7..0adea84540f 100644 --- a/libexec/login_skey/login_skey.c +++ b/libexec/login_skey/login_skey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_skey.c,v 1.18 2007/05/25 21:27:15 krw Exp $ */ +/* $OpenBSD: login_skey.c,v 1.19 2007/07/26 17:48:41 millert Exp $ */ /* * Copyright (c) 2000, 2001, 2004 Todd C. Miller @@ -125,7 +125,7 @@ main(int argc, char *argv[]) switch (mode) { case MODE_LOGIN: haskey = (skeychallenge2(fd, &skey, user, challenge) == 0); - strlcat(challenge, "\nS/Key Password: ", sizeof(challenge)); + strlcat(challenge, "\nS/Key Password:", sizeof(challenge)); /* time out getting passphrase after 2 minutes to avoid a DoS */ if (haskey) @@ -150,7 +150,7 @@ main(int argc, char *argv[]) case MODE_CHALLENGE: haskey = (skeychallenge2(fd, &skey, user, challenge) == 0); - strlcat(challenge, "\nS/Key Password: ", sizeof(challenge)); + strlcat(challenge, "\nS/Key Password:", sizeof(challenge)); fprintf(back, BI_VALUE " challenge %s\n", auth_mkvalue(challenge)); fprintf(back, BI_CHALLENGE "\n"); diff --git a/libexec/login_tis/login_tis.c b/libexec/login_tis/login_tis.c index e85fa111ed8..fafdb390ac0 100644 --- a/libexec/login_tis/login_tis.c +++ b/libexec/login_tis/login_tis.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_tis.c,v 1.5 2006/04/10 20:50:12 deraadt Exp $ */ +/* $OpenBSD: login_tis.c,v 1.6 2007/07/26 17:48:41 millert Exp $ */ /* * Copyright (c) 2004 Todd C. Miller @@ -232,7 +232,7 @@ main(int argc, char *argv[]) } if (rtype == error) { /* didn't read the challenge ourselves so just guess */ - if (strcmp(chalbuf, "Password: ") == 0) + if (strcmp(chalbuf, "Password:") == 0) rtype = password; else rtype = challenge; @@ -639,7 +639,7 @@ tis_authorize(struct tis_connection *tc, const char *user, else if (tis_recv(tc, buf, sizeof(buf)) < 0) resp = error; else if (strncmp(buf, "password", 8) == 0) { - strlcpy(obuf, "Password: ", TIS_BUFSIZ); + strlcpy(obuf, "Password:", TIS_BUFSIZ); resp = password; } else if (strncmp(buf, "challenge ", 10) == 0) { strlcpy(obuf, buf + 10, TIS_BUFSIZ); -- cgit v1.2.3