diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2010-04-10 00:00:17 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2010-04-10 00:00:17 +0000 |
| commit | 1ec3ea37e0f6b9f464c2d5ac49b814e5baadb17b (patch) | |
| tree | 0b7ea971cb7c177e25d4a7360ac033fdb3b28e6b | |
| parent | a6231c7677089fb97f52cf7be394e56b109fcc0c (diff) | |
bz#1746 - suppress spurious tty warning when using -O and stdin
is not a tty; ok dtucker@ markus@
| -rw-r--r-- | usr.bin/ssh/ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 48192bff4f5..328ae25bd00 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.335 2010/02/26 20:29:54 djm Exp $ */ +/* $OpenBSD: ssh.c,v 1.336 2010/04/10 00:00:16 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -607,7 +607,7 @@ main(int ac, char **av) tty_flag = 1; /* Force no tty */ - if (no_tty_flag) + if (no_tty_flag || muxclient_command != 0) tty_flag = 0; /* Do not allocate a tty if stdin is not a tty. */ if ((!isatty(fileno(stdin)) || stdin_null_flag) && !force_tty_flag) { |