diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2011-05-06 21:34:33 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2011-05-06 21:34:33 +0000 |
| commit | 2c06b341f0944bbedfddcf8153c370152ae1e82f (patch) | |
| tree | a10eda5767e3f003ba1c32cb8b7530aff5d1b01d /usr.bin/ssh/mux.c | |
| parent | dee1c204721a0d2467af0b9b46d6dec8b06dd515 (diff) | |
Add a RequestTTY ssh_config option to allow configuration-based
control over tty allocation (like -t/-T); ok markus@
Diffstat (limited to 'usr.bin/ssh/mux.c')
| -rw-r--r-- | usr.bin/ssh/mux.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/ssh/mux.c b/usr.bin/ssh/mux.c index 879546211fa..4f18f196322 100644 --- a/usr.bin/ssh/mux.c +++ b/usr.bin/ssh/mux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mux.c,v 1.26 2011/05/05 05:12:08 djm Exp $ */ +/* $OpenBSD: mux.c,v 1.27 2011/05/06 21:34:32 djm Exp $ */ /* * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> * @@ -70,7 +70,6 @@ /* from ssh.c */ extern int tty_flag; -extern int force_tty_flag; extern Options options; extern int stdin_null_flag; extern char *host; @@ -1686,7 +1685,7 @@ mux_client_request_session(int fd) signal(SIGWINCH, control_client_sigrelay); if (tty_flag) - enter_raw_mode(force_tty_flag); + enter_raw_mode(options.request_tty == REQUEST_TTY_FORCE); /* * Stick around until the controlee closes the client_fd. @@ -1715,7 +1714,7 @@ mux_client_request_session(int fd) } close(fd); - leave_raw_mode(force_tty_flag); + leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE); if (muxclient_terminate) { debug2("Exiting on signal %d", muxclient_terminate); |