diff options
author | Damien Miller <djm@mindrot.org> | 2011-05-15 08:46:29 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2011-05-15 08:46:29 +1000 |
commit | a6bbbe465825338637ad68b41c68827be732cc82 (patch) | |
tree | b011df3f4f263dec92ff5a0e63f9218d18d474fb | |
parent | 21771e22d3e23a10cb01983b2df83d47362eadda (diff) |
- djm@cvs.openbsd.org 2011/05/06 21:38:58
[ssh.c]
fix dropping from previous diff
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | ssh.c | 3 |
2 files changed, 4 insertions, 2 deletions
@@ -36,6 +36,9 @@ | |||
36 | [clientloop.c mux.c readconf.c readconf.h ssh.c ssh_config.5] | 36 | [clientloop.c mux.c readconf.c readconf.h ssh.c ssh_config.5] |
37 | Add a RequestTTY ssh_config option to allow configuration-based | 37 | Add a RequestTTY ssh_config option to allow configuration-based |
38 | control over tty allocation (like -t/-T); ok markus@ | 38 | control over tty allocation (like -t/-T); ok markus@ |
39 | - djm@cvs.openbsd.org 2011/05/06 21:38:58 | ||
40 | [ssh.c] | ||
41 | fix dropping from previous diff | ||
39 | 42 | ||
40 | 20110510 | 43 | 20110510 |
41 | - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix | 44 | - (dtucker) [openbsd-compat/openssl-compat.{c,h}] Bug #1882: fix |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.359 2011/05/06 21:34:32 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.360 2011/05/06 21:38:58 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1401,7 +1401,6 @@ ssh_session2(void) | |||
1401 | otty_flag = tty_flag; | 1401 | otty_flag = tty_flag; |
1402 | stdin_null_flag = 1; | 1402 | stdin_null_flag = 1; |
1403 | no_shell_flag = 1; | 1403 | no_shell_flag = 1; |
1404 | options.request_tty == REQUEST_TTY_NO; | ||
1405 | tty_flag = 0; | 1404 | tty_flag = 0; |
1406 | if (!fork_after_authentication_flag) | 1405 | if (!fork_after_authentication_flag) |
1407 | need_controlpersist_detach = 1; | 1406 | need_controlpersist_detach = 1; |