diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2010-01-09 05:04:25 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2010-01-09 05:04:25 +0000 |
| commit | 2a66c18d202af015a42720e2062350421764580a (patch) | |
| tree | cce762159e9be3f542283f8ba6c9b19fc195e390 /usr.bin/ssh/mux.c | |
| parent | 910f43ec647c79f5e68adecaf2a5e8afd1793114 (diff) | |
quell tc[gs]etattr warnings when forcing a tty (ssh -tt), since we
usually don't actually have a tty to read/set; bz#1686 ok dtucker@
Diffstat (limited to 'usr.bin/ssh/mux.c')
| -rw-r--r-- | usr.bin/ssh/mux.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c index a8f2292578f..6eec57b6b3f 100644 --- a/usr.bin/ssh/mux.c +++ b/usr.bin/ssh/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.8 2009/08/20 23:54:28 dtucker Exp $ */ +/* $OpenBSD: mux.c,v 1.9 2010/01/09 05:04:24 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -71,6 +71,7 @@ /* from ssh.c */ extern int tty_flag; +extern int force_tty_flag; extern Options options; extern int stdin_null_flag; extern char *host; @@ -671,7 +672,7 @@ muxclient(const char *path) signal(SIGWINCH, control_client_sigrelay); if (tty_flag) - enter_raw_mode(); + enter_raw_mode(force_tty_flag); /* * Stick around until the controlee closes the client_fd. @@ -696,7 +697,7 @@ muxclient(const char *path) } close(sock); - leave_raw_mode(); + leave_raw_mode(force_tty_flag); if (i > (int)sizeof(int)) fatal("%s: master returned too much data (%d > %lu)", __func__, i, (u_long)sizeof(int)); |