- djm@cvs.openbsd.org 2011/05/06 21:38:58

     [ssh.c]
     fix dropping from previous diff

2 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 67e65133..7527d765 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,9 @@
      [clientloop.c mux.c readconf.c readconf.h ssh.c ssh_config.5]
      Add a RequestTTY ssh_config option to allow configuration-based
      control over tty allocation (like -t/-T); ok markus@
+   - djm@cvs.openbsd.org 2011/05/06 21:38:58
+     [ssh.c]
+     fix dropping from previous diff
 
 20110510
  - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix
diff --git a/ssh.c b/ssh.c
index 7243fa2a..6080c0c2 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.359 2011/05/06 21:34:32 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.360 2011/05/06 21:38:58 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1401,7 +1401,6 @@ ssh_session2(void)
 		otty_flag = tty_flag;
  		stdin_null_flag = 1;
  		no_shell_flag = 1;
- 		options.request_tty == REQUEST_TTY_NO;
  		tty_flag = 0;
 		if (!fork_after_authentication_flag)
 			need_controlpersist_detach = 1;