diff options
| author | Damien Miller <djm@mindrot.org> | 2005-05-26 12:05:05 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2005-05-26 12:05:05 +1000 |
| commit | ddee575b988e1f4858abfff0aca13d7ba016f2e4 (patch) | |
| tree | 55639e613953ffb02153c54952cf97de706a6f85 /ssh.c | |
| parent | 167ea5d0268243991ad3c55cb20fa2b53f577b37 (diff) | |
| download | openssh-git-ddee575b988e1f4858abfff0aca13d7ba016f2e4.tar.gz | |
- 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.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.235 2005/04/06 12:26:06 dtucker Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.236 2005/04/21 11:47:19 djm Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -550,7 +550,7 @@ again: if (no_tty_flag) tty_flag = 0; /* Do not allocate a tty if stdin is not a tty. */ - if (!isatty(fileno(stdin)) && !force_tty_flag) { + if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) { if (tty_flag) logit("Pseudo-terminal will not be allocated because stdin is not a terminal."); tty_flag = 0; |