Autoconfiscate GSS-API support, including support for manually disabling it.

[sgt/putty] / config.c

diff --git a/config.c b/config.c
index 8be448e..67a018f 100644 (file)
--- a/config.c
+++ b/config.c
@@ -623,7 +623,7 @@ static void colour_handler(union control *ctrl, void *dlg,
     Config *cfg = (Config *)data;
     struct colour_data *cd =
        (struct colour_data *)ctrl->generic.context.p;
-    int update = FALSE, clear, r, g, b;
+    int update = FALSE, clear = FALSE, r, g, b;
 
     if (event == EVENT_REFRESH) {
        if (ctrl == cd->listbox) {
@@ -1577,8 +1577,8 @@ void setup_config_box(struct controlbox *b, int midsession,
                  "Options controlling character set translation");
 
     s = ctrl_getset(b, "Window/Translation", "trans",
-                   "Character set translation on received data");
-    ctrl_combobox(s, "Received data assumed to be in which character set:",
+                   "Character set translation");
+    ctrl_combobox(s, "Remote character set:",
                  'r', 100, HELPCTX(translation_codepage),
                  codepage_handler, P(NULL), P(NULL));
 
@@ -2051,6 +2051,13 @@ void setup_config_box(struct controlbox *b, int midsession,
                          dlg_stdcheckbox_handler,
                          I(offsetof(Config,try_ki_auth)));
 
+#ifndef NO_GSSAPI
+           ctrl_checkbox(s, "Attempt GSSAPI auth (SSH-2)",
+                         NO_SHORTCUT, HELPCTX(no_help),
+                         dlg_stdcheckbox_handler,
+                         I(offsetof(Config,try_gssapi_auth)));
+#endif
+
            s = ctrl_getset(b, "Connection/SSH/Auth", "params",
                            "Authentication parameters");
            ctrl_checkbox(s, "Allow agent forwarding", 'f',
@@ -2060,6 +2067,12 @@ void setup_config_box(struct controlbox *b, int midsession,
                          HELPCTX(ssh_auth_changeuser),
                          dlg_stdcheckbox_handler,
                          I(offsetof(Config,change_username)));
+#ifndef NO_GSSAPI
+           ctrl_checkbox(s, "Allow GSSAPI credential delegation in SSH-2", NO_SHORTCUT,
+                         HELPCTX(no_help),
+                         dlg_stdcheckbox_handler,
+                         I(offsetof(Config,gssapifwd)));
+#endif
            ctrl_filesel(s, "Private key file for authentication:", 'k',
                         FILTER_KEY_FILES, FALSE, "Select private key file",
                         HELPCTX(ssh_auth_privkey),