From a6bbbe465825338637ad68b41c68827be732cc82 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 15 May 2011 08:46:29 +1000 Subject: - djm@cvs.openbsd.org 2011/05/06 21:38:58 [ssh.c] fix dropping from previous diff --- ChangeLog | 3 +++ ssh.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67e651335..7527d7654 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 7243fa2a6..6080c0c27 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 * Copyright (c) 1995 Tatu Ylonen , 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; -- cgit v1.2.3