diff options
author | Damien Miller <djm@mindrot.org> | 2008-12-09 14:11:32 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-12-09 14:11:32 +1100 |
commit | 586b00532f89e6166e6a74bdf3e801cc59449b84 (patch) | |
tree | 3ae4edd74ec1adeccb0c26ddb6961e7d4ed7deb6 /clientloop.c | |
parent | 16a73076b7a6e23989b76621e36c7adf8a587432 (diff) |
- djm@cvs.openbsd.org 2008/12/09 02:38:18
[clientloop.c]
The ~C escape handler does not work correctly for multiplexed sessions -
it opens a commandline on the master session, instead of on the slave
that requested it. Disable it on slave sessions until such time as it
is fixed; bz#1543 report from Adrian Bridgett via Colin Watson
ok markus@
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clientloop.c b/clientloop.c index df4545828..0d228421c 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.205 2008/12/02 19:01:07 markus Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.206 2008/12/09 02:38:18 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 |
@@ -1042,7 +1042,6 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr, | |||
1042 | Supported escape sequences:\r\n\ | 1042 | Supported escape sequences:\r\n\ |
1043 | %c. - terminate session\r\n\ | 1043 | %c. - terminate session\r\n\ |
1044 | %cB - send a BREAK to the remote system\r\n\ | 1044 | %cB - send a BREAK to the remote system\r\n\ |
1045 | %cC - open a command line\r\n\ | ||
1046 | %cR - Request rekey (SSH protocol 2 only)\r\n\ | 1045 | %cR - Request rekey (SSH protocol 2 only)\r\n\ |
1047 | %c# - list forwarded connections\r\n\ | 1046 | %c# - list forwarded connections\r\n\ |
1048 | %c? - this message\r\n\ | 1047 | %c? - this message\r\n\ |
@@ -1051,8 +1050,7 @@ Supported escape sequences:\r\n\ | |||
1051 | escape_char, escape_char, | 1050 | escape_char, escape_char, |
1052 | escape_char, escape_char, | 1051 | escape_char, escape_char, |
1053 | escape_char, escape_char, | 1052 | escape_char, escape_char, |
1054 | escape_char, escape_char, | 1053 | escape_char, escape_char); |
1055 | escape_char); | ||
1056 | } else { | 1054 | } else { |
1057 | snprintf(string, sizeof string, | 1055 | snprintf(string, sizeof string, |
1058 | "%c?\r\n\ | 1056 | "%c?\r\n\ |
@@ -1087,6 +1085,8 @@ Supported escape sequences:\r\n\ | |||
1087 | continue; | 1085 | continue; |
1088 | 1086 | ||
1089 | case 'C': | 1087 | case 'C': |
1088 | if (c && c->ctl_fd != -1) | ||
1089 | goto noescape; | ||
1090 | process_cmdline(); | 1090 | process_cmdline(); |
1091 | continue; | 1091 | continue; |
1092 | 1092 | ||