X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/76d3d354e2ab9b03c61d5d81369b40677628df5a..479fe1ba750b1cda0ad3a159f2727619555436b0:/config.c

diff --git a/config.c b/config.c
index 146fb58b..08ad4900 100644
--- a/config.c
+++ b/config.c
@@ -362,6 +362,7 @@ static void sessionsaver_handler(union control *ctrl, void *dlg,
 		    dlg_end(dlg, 1);
 		} else
 		    dlg_beep(dlg);
+                return;
 	    }
 
 	    /*
@@ -884,6 +885,21 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 		      "Always overwrite it", I(LGXF_OVR),
 		      "Always append to the end of it", I(LGXF_APN),
 		      "Ask the user every time", I(LGXF_ASK), NULL);
+    ctrl_checkbox(s, "Flush log file frequently", 'u',
+		 HELPCTX(logging_flush),
+		 dlg_stdcheckbox_handler, I(offsetof(Config,logflush)));
+
+    if ((midsession && protocol == PROT_SSH) ||
+	(!midsession && backends[3].name != NULL)) {
+	s = ctrl_getset(b, "Session/Logging", "ssh",
+			"Options specific to SSH packet logging");
+	ctrl_checkbox(s, "Omit known password fields", 'k',
+		      HELPCTX(logging_ssh_omit_password),
+		      dlg_stdcheckbox_handler, I(offsetof(Config,logomitpass)));
+	ctrl_checkbox(s, "Omit session data", 'd',
+		      HELPCTX(logging_ssh_omit_data),
+		      dlg_stdcheckbox_handler, I(offsetof(Config,logomitdata)));
+    }
 
     /*
      * The Terminal panel.
@@ -1221,6 +1237,12 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 
     s = ctrl_getset(b, "Window/Colours", "general",
 		    "General options for colour usage");
+    ctrl_checkbox(s, "Allow terminal to specify ANSI colours", 'i',
+		  HELPCTX(colours_ansi),
+		  dlg_stdcheckbox_handler, I(offsetof(Config,ansi_colour)));
+    ctrl_checkbox(s, "Allow terminal to use xterm 256-colour mode", '2',
+		  HELPCTX(colours_xterm256), dlg_stdcheckbox_handler,
+		  I(offsetof(Config,xterm_256_colour)));
     ctrl_checkbox(s, "Bolded text is a different colour", 'b',
 		  HELPCTX(colours_bold),
 		  dlg_stdcheckbox_handler, I(offsetof(Config,bold_colour)));
@@ -1276,6 +1298,36 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 			 HELPCTX(connection_username),
 			 dlg_stdeditbox_handler, I(offsetof(Config,username)),
 			 I(sizeof(((Config *)0)->username)));
+
+	    ctrl_text(s, "Environment variables:", HELPCTX(telnet_environ));
+	    ctrl_columns(s, 2, 80, 20);
+	    ed = (struct environ_data *)
+		ctrl_alloc(b, sizeof(struct environ_data));
+	    ed->varbox = ctrl_editbox(s, "Variable", 'v', 60,
+				      HELPCTX(telnet_environ),
+				      environ_handler, P(ed), P(NULL));
+	    ed->varbox->generic.column = 0;
+	    ed->valbox = ctrl_editbox(s, "Value", 'l', 60,
+				      HELPCTX(telnet_environ),
+				      environ_handler, P(ed), P(NULL));
+	    ed->valbox->generic.column = 0;
+	    ed->addbutton = ctrl_pushbutton(s, "Add", 'd',
+					    HELPCTX(telnet_environ),
+					    environ_handler, P(ed));
+	    ed->addbutton->generic.column = 1;
+	    ed->rembutton = ctrl_pushbutton(s, "Remove", 'r',
+					    HELPCTX(telnet_environ),
+					    environ_handler, P(ed));
+	    ed->rembutton->generic.column = 1;
+	    ctrl_columns(s, 1, 100);
+	    ed->listbox = ctrl_listbox(s, NULL, NO_SHORTCUT,
+				       HELPCTX(telnet_environ),
+				       environ_handler, P(ed));
+	    ed->listbox->listbox.height = 3;
+	    ed->listbox->listbox.ncols = 2;
+	    ed->listbox->listbox.percentages = snewn(2, int);
+	    ed->listbox->listbox.percentages[0] = 30;
+	    ed->listbox->listbox.percentages[1] = 70;
 	}
 
 	s = ctrl_getset(b, "Connection", "keepalive",
@@ -1377,40 +1429,6 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 	ctrl_settitle(b, "Connection/Telnet",
 		      "Options controlling Telnet connections");
 
-	if (!midsession) {
-	    s = ctrl_getset(b, "Connection/Telnet", "data",
-			    "Data to send to the server");
-	    ctrl_text(s, "Environment variables:", HELPCTX(telnet_environ));
-	    ctrl_columns(s, 2, 80, 20);
-	    ed = (struct environ_data *)
-		ctrl_alloc(b, sizeof(struct environ_data));
-	    ed->varbox = ctrl_editbox(s, "Variable", 'v', 60,
-				      HELPCTX(telnet_environ),
-				      environ_handler, P(ed), P(NULL));
-	    ed->varbox->generic.column = 0;
-	    ed->valbox = ctrl_editbox(s, "Value", 'l', 60,
-				      HELPCTX(telnet_environ),
-				      environ_handler, P(ed), P(NULL));
-	    ed->valbox->generic.column = 0;
-	    ed->addbutton = ctrl_pushbutton(s, "Add", 'd',
-					    HELPCTX(telnet_environ),
-					    environ_handler, P(ed));
-	    ed->addbutton->generic.column = 1;
-	    ed->rembutton = ctrl_pushbutton(s, "Remove", 'r',
-					    HELPCTX(telnet_environ),
-					    environ_handler, P(ed));
-	    ed->rembutton->generic.column = 1;
-	    ctrl_columns(s, 1, 100);
-	    ed->listbox = ctrl_listbox(s, NULL, NO_SHORTCUT,
-				       HELPCTX(telnet_environ),
-				       environ_handler, P(ed));
-	    ed->listbox->listbox.height = 3;
-	    ed->listbox->listbox.ncols = 2;
-	    ed->listbox->listbox.percentages = snewn(2, int);
-	    ed->listbox->listbox.percentages[0] = 30;
-	    ed->listbox->listbox.percentages[1] = 70;
-	}
-
 	s = ctrl_getset(b, "Connection/Telnet", "protocol",
 			"Telnet protocol adjustments");
 
@@ -1479,6 +1497,10 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 		      HELPCTX(ssh_nopty),
 		      dlg_stdcheckbox_handler,
 		      I(offsetof(Config,nopty)));
+	ctrl_checkbox(s, "Don't start a shell or command at all", 'n',
+		      HELPCTX(ssh_noshell),
+		      dlg_stdcheckbox_handler,
+		      I(offsetof(Config,ssh_no_shell)));
 	ctrl_checkbox(s, "Enable compression", 'e',
 		      HELPCTX(ssh_compress),
 		      dlg_stdcheckbox_handler,
@@ -1490,7 +1512,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
 			  "1 only", 'l', I(0),
 			  "1", '1', I(1),
 			  "2", '2', I(2),
-			  "2 only", 'n', I(3), NULL);
+			  "2 only", 'y', I(3), NULL);
 
 	s = ctrl_getset(b, "Connection/SSH", "encryption", "Encryption options");
 	c = ctrl_draglist(s, "Encryption cipher selection policy:", 's',