===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/sshconnect.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- src/usr.bin/ssh/sshconnect.c	2001/02/08 19:30:52	1.95
+++ src/usr.bin/ssh/sshconnect.c	2001/02/08 22:35:30	1.96
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.95 2001/02/08 19:30:52 itojun Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.96 2001/02/08 22:35:30 markus Exp $");
 
 #include <openssl/bn.h>
 
@@ -417,12 +417,16 @@
 	debug("Local version string %.100s", client_version_string);
 }
 
+/* defaults to 'no' */
 int
 read_yes_or_no(const char *prompt, int defval)
 {
 	char buf[1024];
 	FILE *f;
 	int retval = -1;
+
+	if (options.batch_mode)
+		return 0;
 
 	if (isatty(STDIN_FILENO))
 		f = stdin;