nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-18 11:31:00 -05:00
Code Issues Projects Releases Wiki Activity

Disable some mid-session configs for downstreams.

Browse Source 
Compression, encryption, and key exchange settings are all meaningless
to reconfigure in connection-sharing downstreams.
This commit is contained in:
Jacob Nevins
2014-11-09 00:10:46 +00:00
parent cda67c7c44
commit f662ff790c
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config.c
View File

@ -2136,7 +2136,8 @@ void setup_config_box(struct controlbox *b, int midsession,
ctrl_settitle(b, "Connection/SSH",
"Options controlling SSH connections");
if (midsession && protcfginfo == 1) {
/* SSH-1 or connection-sharing downstream */
if (midsession && (protcfginfo == 1 || protcfginfo == -1)) {
s = ctrl_getset(b, "Connection/SSH", "disclaimer", NULL);
ctrl_text(s, "Nothing on this panel may be reconfigured in mid-"
"session; it is only here so that sub-panels of it can "
@ -2158,7 +2159,7 @@ void setup_config_box(struct controlbox *b, int midsession,
I(CONF_ssh_no_shell));
}
if (!midsession || protcfginfo != 1) {
if (!midsession || !(protcfginfo == 1 || protcfginfo == -1)) {
s = ctrl_getset(b, "Connection/SSH", "protocol", "Protocol options");
ctrl_checkbox(s, "Enable compression", 'e',
@ -2203,9 +2204,10 @@ void setup_config_box(struct controlbox *b, int midsession,
/*
* The Connection/SSH/Kex panel. (Owing to repeat key
* exchange, much of this is meaningful in mid-session _if_
* we're using SSH-2 or haven't decided yet.)
* we're using SSH-2 and are not a connection-sharing
* downstream, or haven't decided yet.)
*/
if (protcfginfo != 1) {
if (protcfginfo != 1 && protcfginfo != -1) {
ctrl_settitle(b, "Connection/SSH/Kex",
"Options controlling SSH key exchange");
@ -2276,7 +2278,7 @@ void setup_config_box(struct controlbox *b, int midsession,
ctrl_columns(s, 1, 100);
}
if (!midsession || protcfginfo != 1) {
if (!midsession || !(protcfginfo == 1 || protcfginfo == -1)) {
/*
* The Connection/SSH/Cipher panel.
*/