2 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b9d6de72d..68790ca14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,10 @@
      [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 ssh_config.5 sshd.8]
      [sshd_config.5] OpenSSH doesn't ever look at the $HOME environment
      variable, so don't say that we do (bz #623); ok deraadt@
+   - 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@
 
 20050524
  - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@@ -2526,4 +2530,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3768 2005/05/26 02:04:02 djm Exp $
+$Id: ChangeLog,v 1.3769 2005/05/26 02:05:05 djm Exp $
diff --git a/ssh.c b/ssh.c
index cff54b9d6..add697ae0 100644
--- a/ssh.c
+++ b/ssh.c
@@ -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;