===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshconnect.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- src/usr.bin/ssh/sshconnect.c	2001/10/06 00:14:50	1.112
+++ src/usr.bin/ssh/sshconnect.c	2001/10/06 11:18:19	1.113
@@ -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 @@
 	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 @@
 		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 @@
 			    "(yes/no)? ", host, ip, type, fp);
 			xfree(fp);
 			if (!confirm(prompt)) {
-				log("Aborted by user!");
 				goto fail;
 			}
 		}
@@ -809,7 +808,6 @@
 		} 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;
 			}
 		}