X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config.c;h=c2acd6287a83558c7147da29229d6605a76d4f9b;hb=56a42d09d43e91603f3fbf01f5781bcbbc54a6bd;hp=711028c74e0f55ef53e9eb455c156c4bda9529c9;hpb=cda67c7c44bd1b1aef29fa9dc27118aa5ba35e2c;p=PuTTY.git

diff --git a/config.c b/config.c
index 711028c7..c2acd628 100644
--- a/config.c
+++ b/config.c
@@ -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.
 	     */