X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/7374c7790ee32f36855e4257eb15d2fe43e277ea..62ddb51e0424dd4bd1098b024f2427959aefc729:/config.c?ds=sidebyside

diff --git a/config.c b/config.c
index 7992e27d..7e0a2fe6 100644
--- a/config.c
+++ b/config.c
@@ -1171,20 +1171,24 @@ void setup_config_box(struct controlbox *b, int midsession,
      * logging can sensibly be available.
      */
     {
-	char *sshlogname;
+	char *sshlogname, *sshrawlogname;
 	if ((midsession && protocol == PROT_SSH) ||
-	    (!midsession && backends[3].name != NULL))
-	    sshlogname = "Log SSH packet data";
-	else
-	    sshlogname = NULL;	       /* this will disable the button */
-	ctrl_radiobuttons(s, "Session logging:", NO_SHORTCUT, 1,
+	    (!midsession && backends[3].name != NULL)) {
+	    sshlogname = "SSH packets";
+	    sshrawlogname = "SSH packets and raw data";
+        } else {
+	    sshlogname = NULL;	       /* this will disable both buttons */
+	    sshrawlogname = NULL;      /* this will just placate optimisers */
+        }
+	ctrl_radiobuttons(s, "Session logging:", NO_SHORTCUT, 2,
 			  HELPCTX(logging_main),
 			  loggingbuttons_handler,
 			  I(offsetof(Config, logtype)),
-			  "Logging turned off completely", 't', I(LGTYP_NONE),
-			  "Log printable output only", 'p', I(LGTYP_ASCII),
-			  "Log all session output", 'l', I(LGTYP_DEBUG),
+			  "None", 't', I(LGTYP_NONE),
+			  "Printable output", 'p', I(LGTYP_ASCII),
+			  "All session output", 'l', I(LGTYP_DEBUG),
 			  sshlogname, 's', I(LGTYP_PACKETS),
+			  sshrawlogname, 'r', I(LGTYP_SSHRAW),
 			  NULL);
     }
     ctrl_filesel(s, "Log file name:", 'f',
@@ -1359,9 +1363,13 @@ void setup_config_box(struct controlbox *b, int midsession,
 		  HELPCTX(features_retitle),
 		  dlg_stdcheckbox_handler,
 		  I(offsetof(Config,no_remote_wintitle)));
-    ctrl_checkbox(s, "Disable remote window title querying (SECURITY)",
-		  'q', HELPCTX(features_qtitle), dlg_stdcheckbox_handler,
-		  I(offsetof(Config,no_remote_qtitle)));
+    ctrl_radiobuttons(s, "Response to remote title query (SECURITY):", 'q', 3,
+		      HELPCTX(features_qtitle),
+		      dlg_stdradiobutton_handler,
+		      I(offsetof(Config,remote_qtitle_action)),
+		      "None", I(TITLE_NONE),
+		      "Empty string", I(TITLE_EMPTY),
+		      "Window title", I(TITLE_REAL), NULL);
     ctrl_checkbox(s, "Disable destructive backspace on server sending ^?",'b',
 		  HELPCTX(features_dbackspace),
 		  dlg_stdcheckbox_handler, I(offsetof(Config,no_dbackspace)));