diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sshconnect.c | 6 |
2 files changed, 10 insertions, 2 deletions
@@ -73,6 +73,10 @@ | |||
73 | [ssh-keyscan.c] | 73 | [ssh-keyscan.c] |
74 | do not assume malloc() returns zero-filled region. found by | 74 | do not assume malloc() returns zero-filled region. found by |
75 | malloc.conf=AJ. | 75 | malloc.conf=AJ. |
76 | - markus@cvs.openbsd.org 2001/02/08 22:35:30 | ||
77 | [sshconnect.c] | ||
78 | don't connect if batch_mode is true and stricthostkeychecking set to | ||
79 | 'ask' | ||
76 | - (bal) fixed sftp-client.c. Return 'status' instead of '0' | 80 | - (bal) fixed sftp-client.c. Return 'status' instead of '0' |
77 | (from the OpenBSD tree) | 81 | (from the OpenBSD tree) |
78 | - (bal) Synced ssh.1, ssh-add.1 and sshd.8 w/ OpenBSD | 82 | - (bal) Synced ssh.1, ssh-add.1 and sshd.8 w/ OpenBSD |
@@ -3860,4 +3864,4 @@ | |||
3860 | - Wrote replacements for strlcpy and mkdtemp | 3864 | - Wrote replacements for strlcpy and mkdtemp |
3861 | - Released 1.0pre1 | 3865 | - Released 1.0pre1 |
3862 | 3866 | ||
3863 | $Id: ChangeLog,v 1.732 2001/02/10 23:18:11 mouring Exp $ | 3867 | $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 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.95 2001/02/08 19:30:52 itojun Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.96 2001/02/08 22:35:30 markus Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -421,6 +421,7 @@ ssh_exchange_identification(void) | |||
421 | debug("Local version string %.100s", client_version_string); | 421 | debug("Local version string %.100s", client_version_string); |
422 | } | 422 | } |
423 | 423 | ||
424 | /* defaults to 'no' */ | ||
424 | int | 425 | int |
425 | read_yes_or_no(const char *prompt, int defval) | 426 | read_yes_or_no(const char *prompt, int defval) |
426 | { | 427 | { |
@@ -428,6 +429,9 @@ read_yes_or_no(const char *prompt, int defval) | |||
428 | FILE *f; | 429 | FILE *f; |
429 | int retval = -1; | 430 | int retval = -1; |
430 | 431 | ||
432 | if (options.batch_mode) | ||
433 | return 0; | ||
434 | |||
431 | if (isatty(STDIN_FILENO)) | 435 | if (isatty(STDIN_FILENO)) |
432 | f = stdin; | 436 | f = stdin; |
433 | else | 437 | else |