diff options
author | Damien Miller <djm@mindrot.org> | 2010-04-16 15:52:43 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-04-16 15:52:43 +1000 |
commit | deb5a1423a72cb96c629d5514be58897cd7a24ce (patch) | |
tree | 3503b5f40f5945eb9f83b914f4c9e4fd63300b81 | |
parent | 544378da56f8ad4620874183a14100b6ef1a464c (diff) |
- djm@cvs.openbsd.org 2010/04/10 00:00:16
[ssh.c]
bz#1746 - suppress spurious tty warning when using -O and stdin
is not a tty; ok dtucker@ markus@
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ssh.c | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -11,6 +11,10 @@ | |||
11 | - jmc@cvs.openbsd.org 2010/03/27 14:26:55 | 11 | - jmc@cvs.openbsd.org 2010/03/27 14:26:55 |
12 | [ssh_config.5] | 12 | [ssh_config.5] |
13 | tweak previous; ok dtucker | 13 | tweak previous; ok dtucker |
14 | - djm@cvs.openbsd.org 2010/04/10 00:00:16 | ||
15 | [ssh.c] | ||
16 | bz#1746 - suppress spurious tty warning when using -O and stdin | ||
17 | is not a tty; ok dtucker@ markus@ | ||
14 | 18 | ||
15 | 20100410 | 19 | 20100410 |
16 | - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo | 20 | - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.335 2010/02/26 20:29:54 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.336 2010/04/10 00:00:16 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 |
@@ -620,7 +620,7 @@ main(int ac, char **av) | |||
620 | tty_flag = 1; | 620 | tty_flag = 1; |
621 | 621 | ||
622 | /* Force no tty */ | 622 | /* Force no tty */ |
623 | if (no_tty_flag) | 623 | if (no_tty_flag || muxclient_command != 0) |
624 | tty_flag = 0; | 624 | tty_flag = 0; |
625 | /* Do not allocate a tty if stdin is not a tty. */ | 625 | /* Do not allocate a tty if stdin is not a tty. */ |
626 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) { | 626 | if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) { |