diff options
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.235 2005/04/06 12:26:06 dtucker Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.236 2005/04/21 11:47:19 djm Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -550,7 +550,7 @@ again: | |||
550 | if (no_tty_flag) | 550 | if (no_tty_flag) |
551 | tty_flag = 0; | 551 | tty_flag = 0; |
552 | /* Do not allocate a tty if stdin is not a tty. */ | 552 | /* Do not allocate a tty if stdin is not a tty. */ |
553 | if (!isatty(fileno(stdin)) && !force_tty_flag) { | 553 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) { |
554 | if (tty_flag) | 554 | if (tty_flag) |
555 | logit("Pseudo-terminal will not be allocated because stdin is not a terminal."); | 555 | logit("Pseudo-terminal will not be allocated because stdin is not a terminal."); |
556 | tty_flag = 0; | 556 | tty_flag = 0; |