summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2005-05-26 12:05:05 +1000
committerDamien Miller <djm@mindrot.org>2005-05-26 12:05:05 +1000
commitddee575b988e1f4858abfff0aca13d7ba016f2e4 (patch)
tree55639e613953ffb02153c54952cf97de706a6f85 /ssh.c
parent167ea5d0268243991ad3c55cb20fa2b53f577b37 (diff)
- djm@cvs.openbsd.org 2005/04/21 11:47:19
[ssh.c] don't allocate a pty when -n flag (/dev/null stdin) is set, patch from ignasi.roca AT fujitsu-siemens.com (bz #829); ok dtucker@
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh.c b/ssh.c
index cff54b9d6..add697ae0 100644
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: ssh.c,v 1.235 2005/04/06 12:26:06 dtucker Exp $"); 43RCSID("$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;