commit b6c06d9303aedfaf0af539758243eb4b4d263459
author Ben Lindstrom <mouring@eviladmin.org> Sat Feb 10 23:21:09 2001 +0000
committer Ben Lindstrom <mouring@eviladmin.org> Sat Feb 10 23:21:09 2001 +0000
tree b02cfc90eee5e8850d9ee4a14dacd19008e2337d
parent c791bebc2a0e15af332151502ca56c4d7f15ebc1

   - markus@cvs.openbsd.org 2001/02/08 22:35:30
     [sshconnect.c]
     don't connect if batch_mode is true and stricthostkeychecking set to
    'ask'

sshconnect.c

diff --git a/sshconnect.c b/sshconnect.c
index 10f52a0..2de7262 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -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>
 
@@ -421,6 +421,7 @@
 	debug("Local version string %.100s", client_version_string);
 }
 
+/* defaults to 'no' */
 int
 read_yes_or_no(const char *prompt, int defval)
 {
@@ -428,6 +429,9 @@
 	FILE *f;
 	int retval = -1;
 
+	if (options.batch_mode)
+		return 0;
+
 	if (isatty(STDIN_FILENO))
 		f = stdin;
 	else