diff options
| author | Damien Miller <djm@mindrot.org> | 2001-10-10 15:03:11 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-10-10 15:03:11 +1000 |
| commit | 59d9fb9e55f2448ec8b0911f05bdb943e8235ed2 (patch) | |
| tree | c3cd91bf7853bcdff075ea6f45af6ee5764f0d3b /sshconnect.c | |
| parent | 9c751429176f774bc327c23acb0711e76856e209 (diff) | |
| download | openssh-git-59d9fb9e55f2448ec8b0911f05bdb943e8235ed2.tar.gz | |
- markus@cvs.openbsd.org 2001/10/06 11:18:19
[sshconnect1.c sshconnect2.c sshconnect.c]
unify hostkey check error messages, simplify prompt.
Diffstat (limited to 'sshconnect.c')
| -rw-r--r-- | sshconnect.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sshconnect.c b/sshconnect.c index ed212523..76b1a270 100644 --- a/sshconnect.c +++ b/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> @@ -506,8 +506,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); @@ -520,7 +520,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) @@ -703,7 +703,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; } } @@ -821,7 +820,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; } } |