Implement part of `ssh2-generality': introduce the ability to tell

[u/mdw/putty] / config.c

diff --git a/config.c b/config.c
index 03dcbf7..8588b23 100644 (file)
--- a/config.c
+++ b/config.c
@@ -358,6 +358,7 @@ static void sessionsaver_handler(union control *ctrl, void *dlg,
                /* If at this point we have a valid session, go! */
                if (*cfg2.host) {
                    *cfg = cfg2;       /* structure copy */
+                   cfg->remote_cmd_ptr = cfg->remote_cmd; /* nasty */
                    dlg_end(dlg, 1);
                } else
                    dlg_beep(dlg);
@@ -884,6 +885,18 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
                      "Always append to the end of it", I(LGXF_APN),
                      "Ask the user every time", I(LGXF_ASK), NULL);
 
+    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.
      */
@@ -1036,6 +1049,12 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
     ctrl_checkbox(s, "Disable remote-controlled character set configuration",
                  'r', HELPCTX(features_charset), dlg_stdcheckbox_handler,
                  I(offsetof(Config,no_remote_charset)));
+    ctrl_checkbox(s, "Disable Arabic text shaping",
+                 'l', HELPCTX(features_arabicshaping), dlg_stdcheckbox_handler,
+                 I(offsetof(Config, arabicshaping)));
+    ctrl_checkbox(s, "Disable bidirectional text display",
+                 'd', HELPCTX(features_bidi), dlg_stdcheckbox_handler,
+                 I(offsetof(Config, bidi)));
 
     /*
      * The Window panel.
@@ -1285,6 +1304,10 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
                          'n', HELPCTX(connection_nodelay),
                          dlg_stdcheckbox_handler,
                          I(offsetof(Config,tcp_nodelay)));
+           ctrl_checkbox(s, "Enable TCP keepalives (SO_KEEPALIVE option)",
+                         'p', HELPCTX(connection_tcpkeepalive),
+                         dlg_stdcheckbox_handler,
+                         I(offsetof(Config,tcp_keepalives)));
        }
 
     }
@@ -1417,12 +1440,12 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
                              I(offsetof(Config, passive_telnet)),
                              "Passive", I(1), "Active", I(0), NULL);
        }
-       ctrl_checkbox(s, "Keyboard sends telnet Backspace and Interrupt", 'k',
+       ctrl_checkbox(s, "Keyboard sends Telnet special commands", 'k',
                      HELPCTX(telnet_specialkeys),
                      dlg_stdcheckbox_handler,
                      I(offsetof(Config,telnet_keyboard)));
-       ctrl_checkbox(s, "Return key sends telnet New Line instead of ^M",
-                     NO_SHORTCUT, HELPCTX(telnet_newline),
+       ctrl_checkbox(s, "Return key sends Telnet New Line instead of ^M",
+                     'm', HELPCTX(telnet_newline),
                      dlg_stdcheckbox_handler,
                      I(offsetof(Config,telnet_newline)));
     }
@@ -1468,6 +1491,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,
@@ -1479,7 +1506,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',