New SSH bug flag, for 'can't handle SSH2_MSG_IGNORE'. Another user

[u/mdw/putty] / config.c

diff --git a/config.c b/config.c
index d0931f8..bc48e27 100644 (file)
--- a/config.c
+++ b/config.c
@@ -1176,7 +1176,7 @@ void setup_config_box(struct controlbox *b, int midsession,
            ctrl_radiobuttons(s, "Connection type:", NO_SHORTCUT, 3,
                              HELPCTX(session_hostname),
                              config_protocolbuttons_handler, P(hp),
-                             "Raw", 'r', I(PROT_RAW),
+                             "Raw", 'w', I(PROT_RAW),
                              "Telnet", 't', I(PROT_TELNET),
                              "Rlogin", 'i', I(PROT_RLOGIN),
                              NULL);
@@ -1184,7 +1184,7 @@ void setup_config_box(struct controlbox *b, int midsession,
            ctrl_radiobuttons(s, "Connection type:", NO_SHORTCUT, 4,
                              HELPCTX(session_hostname),
                              config_protocolbuttons_handler, P(hp),
-                             "Raw", 'r', I(PROT_RAW),
+                             "Raw", 'w', I(PROT_RAW),
                              "Telnet", 't', I(PROT_TELNET),
                              "Rlogin", 'i', I(PROT_RLOGIN),
                              "SSH", 's', I(PROT_SSH),
@@ -1242,7 +1242,7 @@ void setup_config_box(struct controlbox *b, int midsession,
     ctrl_columns(s, 1, 100);
 
     s = ctrl_getset(b, "Session", "otheropts", NULL);
-    c = ctrl_radiobuttons(s, "Close window on exit:", 'w', 4,
+    c = ctrl_radiobuttons(s, "Close window on exit:", 'x', 4,
                          HELPCTX(session_coe),
                          dlg_stdradiobutton_handler,
                          I(offsetof(Config, close_on_exit)),
@@ -1765,7 +1765,8 @@ void setup_config_box(struct controlbox *b, int midsession,
                /* We assume the local username is sufficiently stable
                 * to include on the dialog box. */
                char *user = get_username();
-               char *userlabel = dupprintf("Use system username (%s)", user);
+               char *userlabel = dupprintf("Use system username (%s)",
+                                           user ? user : "");
                sfree(user);
                ctrl_radiobuttons(s, "When username is not specified:", 'n', 4,
                                  HELPCTX(connection_username_from_env),
@@ -2283,6 +2284,9 @@ void setup_config_box(struct controlbox *b, int midsession,
            ctrl_droplist(s, "Chokes on SSH-1 RSA authentication", 'r', 20,
                          HELPCTX(ssh_bugs_rsa1),
                          sshbug_handler, I(offsetof(Config,sshbug_rsa1)));
+           ctrl_droplist(s, "Chokes on SSH-2 ignore messages", '2', 20,
+                         HELPCTX(ssh_bugs_ignore2),
+                         sshbug_handler, I(offsetof(Config,sshbug_ignore2)));
            ctrl_droplist(s, "Miscomputes SSH-2 HMAC keys", 'm', 20,
                          HELPCTX(ssh_bugs_hmac2),
                          sshbug_handler, I(offsetof(Config,sshbug_hmac2)));