2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 6b9bc5e97..789e7af47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,10 @@
    - jmc@cvs.openbsd.org 2010/03/27 14:26:55
      [ssh_config.5]
      tweak previous; ok dtucker
+   - 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@
 
 20100410
  - (dtucker) [configure.ac] Put the check for the existence of getaddrinfo
diff --git a/ssh.c b/ssh.c
index b9553d3e1..2230edd16 100644
--- a/ssh.c
+++ b/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
@@ -620,7 +620,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) {