From db65e8fdedadaf79df2d8393a4d43e9094c80649 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Fri, 19 Jan 2001 04:26:52 +0000 Subject: Please grep through the source and look for 'ISSUE' comments and verify that I was able to get all the portable bits in the right location. As for the SKEY comment there is an email out to Markus as to how it should be resolved. Until then I just #ifdef SKEY/#endif out the whole block. - (bal) OpenBSD Resync - markus@cvs.openbsd.org 2001/01/18 16:20:21 [log-client.c log-server.c log.c readconf.c servconf.c ssh.1 ssh.h sshd.8 sshd.c] log() is at pri=LOG_INFO, since LOG_NOTICE goes to /dev/console on many systems - markus@cvs.openbsd.org 2001/01/18 16:59:59 [auth-passwd.c auth.c auth.h auth1.c auth2.c serverloop.c session.c session.h sshconnect1.c] 1) removes fake skey from sshd, since this will be much harder with /usr/libexec/auth/login_XXX 2) share/unify code used in ssh-1 and ssh-2 authentication (server side) 3) make addition of BSD_AUTH and other challenge reponse methods easier. - markus@cvs.openbsd.org 2001/01/18 17:12:43 [auth-chall.c auth2-chall.c] rename *-skey.c *-chall.c since the files are not skey specific --- sshconnect1.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sshconnect1.c') diff --git a/sshconnect1.c b/sshconnect1.c index 17b381c1..b2d4e57b 100644 --- a/sshconnect1.c +++ b/sshconnect1.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect1.c,v 1.15 2001/01/16 23:58:09 deraadt Exp $"); +RCSID("$OpenBSD: sshconnect1.c,v 1.16 2001/01/18 17:00:00 markus Exp $"); #include #include @@ -630,7 +630,8 @@ try_skey_authentication() } challenge = packet_get_string(&clen); packet_integrity_check(payload_len, (4 + clen), type); - snprintf(prompt, sizeof prompt, "%s\nResponse: ", challenge); + snprintf(prompt, sizeof prompt, "%s%s", challenge, + strchr(challenge, '\n') ? "" : "\nResponse: "); xfree(challenge); if (i != 0) error("Permission denied, please try again."); -- cgit v1.2.1