From df224031ca59175e021c9b0084060fb9a909f31e Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 22 Jan 2002 23:25:46 +1100 Subject: [PATCH] - markus@cvs.openbsd.org 2002/01/12 13:10:29 [auth-skey.c] undo local change --- ChangeLog | 5 ++++- auth-skey.c | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 406b8e2c2..9931a8a41 100644 --- a/ChangeLog +++ b/ChangeLog @@ -149,6 +149,9 @@ - markus@cvs.openbsd.org 2002/01/11 23:26:30 [auth-skey.c] use snprintf; mouring@ + - markus@cvs.openbsd.org 2002/01/12 13:10:29 + [auth-skey.c] + undo local change 20020121 @@ -7297,4 +7300,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1765 2002/01/22 12:25:30 djm Exp $ +$Id: ChangeLog,v 1.1766 2002/01/22 12:25:46 djm Exp $ diff --git a/auth-skey.c b/auth-skey.c index d98fa6b01..df19f7507 100644 --- a/auth-skey.c +++ b/auth-skey.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: auth-skey.c,v 1.15 2002/01/11 23:26:30 markus Exp $"); +RCSID("$OpenBSD: auth-skey.c,v 1.16 2002/01/12 13:10:29 markus Exp $"); #ifdef SKEY @@ -60,7 +60,8 @@ skey_query(void *ctx, char **name, char **infotxt, len = strlen(challenge) + strlen(PROMPT) + 1; p = xmalloc(len); - snprintf(p, len, "%s%s", challenge, PROMPT); + strlcpy(p, challenge, len); + strlcat(p, PROMPT, len); (*prompts)[0] = p; return 0;