diff options
author | 2001-10-06 11:18:19 +0000 | |
---|---|---|
committer | 2001-10-06 11:18:19 +0000 | |
commit | 59c9099a9df4a6a1581824c923a0529d9bcaab4d (patch) | |
tree | 53b3f06f0ba9761f06a8fcda8e5d77c91dd64f5a /usr.bin/ssh/sshconnect.c | |
parent | regression test for last buglet. Thanks Dale. (diff) | |
download | wireguard-openbsd-59c9099a9df4a6a1581824c923a0529d9bcaab4d.tar.xz wireguard-openbsd-59c9099a9df4a6a1581824c923a0529d9bcaab4d.zip |
unify hostkey check error messages, simplify prompt.
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
-rw-r--r-- | usr.bin/ssh/sshconnect.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 2c61af35177..b9e6012919a 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.112 2001/10/06 00:14:50 markus Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.113 2001/10/06 11:18:19 markus Exp $"); #include <openssl/bn.h> @@ -498,8 +498,8 @@ confirm(const char *prompt) if (f == NULL) return 0; fflush(stdout); + fprintf(stderr, "%s", prompt); while (1) { - fprintf(stderr, "%s", prompt); if (fgets(buf, sizeof(buf), f) == NULL) { fprintf(stderr, "\n"); strlcpy(buf, "no", sizeof buf); @@ -512,7 +512,7 @@ confirm(const char *prompt) else if (strcmp(buf, "no") == 0) retval = 0; else - fprintf(stderr, "Please type 'yes' or 'no'.\n"); + fprintf(stderr, "Please type 'yes' or 'no': "); if (retval != -1) { if (f != stdin) @@ -691,7 +691,6 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, "(yes/no)? ", host, ip, type, fp); xfree(fp); if (!confirm(prompt)) { - log("Aborted by user!"); goto fail; } } @@ -809,7 +808,6 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key, } else if (options.strict_host_key_checking == 2) { if (!confirm("Are you sure you want " "to continue connecting (yes/no)? ")) { - log("Aborted by user!"); goto fail; } } |