summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ssh.c4
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 @@
27 [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 ssh_config.5 sshd.8] 27 [ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 ssh_config.5 sshd.8]
28 [sshd_config.5] OpenSSH doesn't ever look at the $HOME environment 28 [sshd_config.5] OpenSSH doesn't ever look at the $HOME environment
29 variable, so don't say that we do (bz #623); ok deraadt@ 29 variable, so don't say that we do (bz #623); ok deraadt@
30 - djm@cvs.openbsd.org 2005/04/21 11:47:19
31 [ssh.c]
32 don't allocate a pty when -n flag (/dev/null stdin) is set, patch from
33 ignasi.roca AT fujitsu-siemens.com (bz #829); ok dtucker@
30 34
3120050524 3520050524
32 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] 36 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
@@ -2526,4 +2530,4 @@
2526 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2530 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2527 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2531 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2528 2532
2529$Id: ChangeLog,v 1.3768 2005/05/26 02:04:02 djm Exp $ 2533$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 @@
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;