X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/8ff5e86d76ed8fd727923d6dd68a1b0099fc3bad..f89c329410c18fe1f09d843747fad77babb9f89c:/config.c?ds=sidebyside

diff --git a/config.c b/config.c
index 0704da3b..6a5961c4 100644
--- a/config.c
+++ b/config.c
@@ -770,7 +770,7 @@ static void portfwd_handler(union control *ctrl, void *dlg,
 }
 
 void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
-		      int midsession, int protocol)
+		      int midsession, int protocol, int protcfginfo)
 {
     struct controlset *s;
     struct sessionsaver_data *ssd;
@@ -845,39 +845,42 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 			      "SSH", 's', I(PROT_SSH),
 			      NULL);
 	}
-
-	s = ctrl_getset(b, "Session", "savedsessions",
-			"Load, save or delete a stored session");
-	ctrl_columns(s, 2, 75, 25);
-	ssd->sesslist = sesslist;
-	ssd->editbox = ctrl_editbox(s, "Saved Sessions", 'e', 100,
-				    HELPCTX(session_saved),
-				    sessionsaver_handler, P(ssd), P(NULL));
-	ssd->editbox->generic.column = 0;
-	/* Reset columns so that the buttons are alongside the list, rather
-	 * than alongside that edit box. */
-	ctrl_columns(s, 1, 100);
-	ctrl_columns(s, 2, 75, 25);
-	ssd->listbox = ctrl_listbox(s, NULL, NO_SHORTCUT,
-				    HELPCTX(session_saved),
-				    sessionsaver_handler, P(ssd));
-	ssd->listbox->generic.column = 0;
-	ssd->listbox->listbox.height = 7;
-	ssd->loadbutton = ctrl_pushbutton(s, "Load", 'l',
-					  HELPCTX(session_saved),
-					  sessionsaver_handler, P(ssd));
-	ssd->loadbutton->generic.column = 1;
-	ssd->savebutton = ctrl_pushbutton(s, "Save", 'v',
-					  HELPCTX(session_saved),
-					  sessionsaver_handler, P(ssd));
-	ssd->savebutton->generic.column = 1;
-	ssd->delbutton = ctrl_pushbutton(s, "Delete", 'd',
-					 HELPCTX(session_saved),
-					 sessionsaver_handler, P(ssd));
-	ssd->delbutton->generic.column = 1;
-	ctrl_columns(s, 1, 100);
     }
 
+    /*
+     * The Load/Save panel is available even in mid-session.
+     */
+    s = ctrl_getset(b, "Session", "savedsessions",
+		    "Load, save or delete a stored session");
+    ctrl_columns(s, 2, 75, 25);
+    ssd->sesslist = sesslist;
+    ssd->editbox = ctrl_editbox(s, "Saved Sessions", 'e', 100,
+				HELPCTX(session_saved),
+				sessionsaver_handler, P(ssd), P(NULL));
+    ssd->editbox->generic.column = 0;
+    /* Reset columns so that the buttons are alongside the list, rather
+     * than alongside that edit box. */
+    ctrl_columns(s, 1, 100);
+    ctrl_columns(s, 2, 75, 25);
+    ssd->listbox = ctrl_listbox(s, NULL, NO_SHORTCUT,
+				HELPCTX(session_saved),
+				sessionsaver_handler, P(ssd));
+    ssd->listbox->generic.column = 0;
+    ssd->listbox->listbox.height = 7;
+    ssd->loadbutton = ctrl_pushbutton(s, "Load", 'l',
+				      HELPCTX(session_saved),
+				      sessionsaver_handler, P(ssd));
+    ssd->loadbutton->generic.column = 1;
+    ssd->savebutton = ctrl_pushbutton(s, "Save", 'v',
+				      HELPCTX(session_saved),
+				      sessionsaver_handler, P(ssd));
+    ssd->savebutton->generic.column = 1;
+    ssd->delbutton = ctrl_pushbutton(s, "Delete", 'd',
+				     HELPCTX(session_saved),
+				     sessionsaver_handler, P(ssd));
+    ssd->delbutton->generic.column = 1;
+    ctrl_columns(s, 1, 100);
+
     s = ctrl_getset(b, "Session", "otheropts", NULL);
     c = ctrl_radiobuttons(s, "Close window on exit:", 'w', 4,
 			  HELPCTX(session_coe),
@@ -1580,33 +1583,36 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 
 	/*
 	 * The Connection/SSH/Kex panel. (Owing to repeat key
-	 * exchange, this is all meaningful in mid-session.)
+	 * exchange, this is all meaningful in mid-session _if_
+	 * we're using SSH2 or haven't decided yet.)
 	 */
-	ctrl_settitle(b, "Connection/SSH/Kex",
-		      "Options controlling SSH key exchange");
-
-	s = ctrl_getset(b, "Connection/SSH/Kex", "main",
-			"Key exchange algorithm options");
-	c = ctrl_draglist(s, "Algorithm selection policy", 's',
-			  HELPCTX(ssh_kexlist),
-			  kexlist_handler, P(NULL));
-	c->listbox.height = 5;
-
-	s = ctrl_getset(b, "Connection/SSH/Kex", "repeat",
-			"Options controlling key re-exchange");
-
-	ctrl_editbox(s, "Max minutes before rekey (0 for no limit)", 't', 20,
-		     HELPCTX(ssh_kex_repeat),
-		     dlg_stdeditbox_handler,
-		     I(offsetof(Config,ssh_rekey_time)),
-		     I(-1));
-	ctrl_editbox(s, "Max data before rekey (0 for no limit)", 'x', 20,
-		     HELPCTX(ssh_kex_repeat),
-		     dlg_stdeditbox_handler,
-		     I(offsetof(Config,ssh_rekey_data)),
-		     I(16));
-	ctrl_text(s, "(Use 1M for 1 megabyte, 1G for 1 gigabyte etc)",
-		  HELPCTX(ssh_kex_repeat));
+	if (protcfginfo != 1) {
+	    ctrl_settitle(b, "Connection/SSH/Kex",
+			  "Options controlling SSH key exchange");
+
+	    s = ctrl_getset(b, "Connection/SSH/Kex", "main",
+			    "Key exchange algorithm options");
+	    c = ctrl_draglist(s, "Algorithm selection policy", 's',
+			      HELPCTX(ssh_kexlist),
+			      kexlist_handler, P(NULL));
+	    c->listbox.height = 5;
+
+	    s = ctrl_getset(b, "Connection/SSH/Kex", "repeat",
+			    "Options controlling key re-exchange");
+
+	    ctrl_editbox(s, "Max minutes before rekey (0 for no limit)", 't', 20,
+			 HELPCTX(ssh_kex_repeat),
+			 dlg_stdeditbox_handler,
+			 I(offsetof(Config,ssh_rekey_time)),
+			 I(-1));
+	    ctrl_editbox(s, "Max data before rekey (0 for no limit)", 'x', 20,
+			 HELPCTX(ssh_kex_repeat),
+			 dlg_stdeditbox_handler,
+			 I(offsetof(Config,ssh_rekey_data)),
+			 I(16));
+	    ctrl_text(s, "(Use 1M for 1 megabyte, 1G for 1 gigabyte etc)",
+		      HELPCTX(ssh_kex_repeat));
+	}
 
 	if (!midsession) {