X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/b3d375b244187cd77f45dc013668e6273e133179..a28d45e3baaeace980ede6d70f8df0261275e0b5:/config.c diff --git a/config.c b/config.c index d689ede9..a1454b4d 100644 --- a/config.c +++ b/config.c @@ -52,7 +52,7 @@ static void config_port_handler(union control *ctrl, void *dlg, char buf[80]; /* - * This function works just like the standard edit box handler, + * This function works similarly to the standard edit box handler, * only it has to choose the control's label and text from two * different places depending on the protocol. */ @@ -66,7 +66,11 @@ static void config_port_handler(union control *ctrl, void *dlg, sprintf(buf, "%d", cfg->serspeed); } else { dlg_label_change(ctrl, dlg, PORT_BOX_TITLE); - sprintf(buf, "%d", cfg->port); + if (cfg->port != 0) + sprintf(buf, "%d", cfg->port); + else + /* Display an (invalid) port of 0 as blank */ + buf[0] = '\0'; } dlg_editbox_set(ctrl, dlg, buf); } else if (event == EVENT_VALCHANGE) { @@ -118,15 +122,16 @@ void config_protocolbuttons_handler(union control *ctrl, void *dlg, Backend *nb = backend_from_proto(cfg->protocol); assert(ob); assert(nb); - /* Iff the user hasn't changed the port from the protocol - * default (if any), update it with the new protocol's - * default. - * (XXX: this isn't perfect; a default can become permanent - * by going via the serial backend. However, it helps with - * the common case of tabbing through the controls in order - * and setting a non-default port.) */ - if (cfg->port == ob->default_port && - cfg->port > 0 && nb->default_port > 0) + /* Iff the user hasn't changed the port from the old protocol's + * default, update it with the new protocol's default. + * (This includes a "default" of 0, implying that there is no + * sensible default for that protocol; in this case it's + * displayed as a blank.) + * This helps with the common case of tabbing through the + * controls in order and setting a non-default port before + * getting to the protocol; we want that non-default port + * to be preserved. */ + if (cfg->port == ob->default_port) cfg->port = nb->default_port; } dlg_refresh(hp->host, dlg); @@ -2088,6 +2093,10 @@ void setup_config_box(struct controlbox *b, int midsession, HELPCTX(ssh_auth_bypass), dlg_stdcheckbox_handler, I(offsetof(Config,ssh_no_userauth))); + ctrl_checkbox(s, "Display pre-authentication banner (SSH-2 only)", + 'd', HELPCTX(ssh_auth_banner), + dlg_stdcheckbox_handler, + I(offsetof(Config,ssh_show_banner))); s = ctrl_getset(b, "Connection/SSH/Auth", "methods", "Authentication methods"); @@ -2104,13 +2113,6 @@ 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', @@ -2120,12 +2122,6 @@ 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), @@ -2133,13 +2129,56 @@ void setup_config_box(struct controlbox *b, int midsession, #ifndef NO_GSSAPI /* + * Connection/SSH/Auth/GSSAPI, which sadly won't fit on + * the main Auth panel. + */ + ctrl_settitle(b, "Connection/SSH/Auth/GSSAPI", + "Options controlling GSSAPI authentication"); + s = ctrl_getset(b, "Connection/SSH/Auth/GSSAPI", "gssapi", NULL); + + ctrl_checkbox(s, "Attempt GSSAPI authentication (SSH-2 only)", + 't', HELPCTX(ssh_gssapi), + dlg_stdcheckbox_handler, + I(offsetof(Config,try_gssapi_auth))); + + ctrl_checkbox(s, "Allow GSSAPI credential delegation", 'l', + HELPCTX(ssh_gssapi_delegation), + dlg_stdcheckbox_handler, + I(offsetof(Config,gssapifwd))); + + /* * GSSAPI library selection. */ if (ngsslibs > 1) { - c = ctrl_draglist(s, "Preference order for GSSAPI libraries:", NO_SHORTCUT, - HELPCTX(no_help), + c = ctrl_draglist(s, "Preference order for GSSAPI libraries:", + 'p', HELPCTX(ssh_gssapi_libraries), gsslist_handler, P(NULL)); c->listbox.height = ngsslibs; + + /* + * I currently assume that if more than one GSS + * library option is available, then one of them is + * 'user-supplied' and so we should present the + * following file selector. This is at least half- + * reasonable, because if we're using statically + * linked GSSAPI then there will only be one option + * and no way to load from a user-supplied library, + * whereas if we're using dynamic libraries then + * there will almost certainly be some default + * option in addition to a user-supplied path. If + * anyone ever ports PuTTY to a system on which + * dynamic-library GSSAPI is available but there is + * absolutely no consensus on where to keep the + * libraries, there'll need to be a flag alongside + * ngsslibs to control whether the file selector is + * displayed. + */ + + ctrl_filesel(s, "User-supplied GSSAPI library path:", 's', + FILTER_DYNLIB_FILES, FALSE, "Select library file", + HELPCTX(ssh_gssapi_libraries), + dlg_stdfilesel_handler, + I(offsetof(Config, ssh_gss_custom))); } #endif }