- 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'

2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 61801f399..c17918a8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,10 @@
      [ssh-keyscan.c]
      do not assume malloc() returns zero-filled region.  found by 
      malloc.conf=AJ.
+   - 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'
  - (bal) fixed sftp-client.c.  Return 'status' instead of '0'  
    (from the OpenBSD tree)
  - (bal) Synced ssh.1, ssh-add.1 and sshd.8 w/ OpenBSD
@@ -3860,4 +3864,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.732 2001/02/10 23:18:11 mouring Exp $
+$Id: ChangeLog,v 1.733 2001/02/10 23:21:09 mouring Exp $
diff --git a/sshconnect.c b/sshconnect.c
index 10f52a073..2de726244 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 @@ ssh_exchange_identification(void)
         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 @@ read_yes_or_no(const char *prompt, int defval)
         FILE *f;
         int retval = -1;
 
+        if (options.batch_mode)
+                return 0;
+
         if (isatty(STDIN_FILENO))
                 f = stdin;
         else