mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-07-17 02:57:33 -05:00
Merge the 0.74 release branch back to master.
Two minor memory-leak fixes on 0.74 seem not to be needed on master: the fix in an early exit path of pageant_add_keyfile is done already on master in a different way, and the missing sfree(fdlist) in uxsftp.c is in code that's been completely rewritten in the uxcliloop refactoring. Other minor conflicts: the rework in commit b52641644905 of ssh1login.c collided with the change from FLAG_VERBOSE to seat_verbose(), and master and 0.74 each added an unrelated extra field to the end of struct SshServerConfig.
This commit is contained in:
8
config.c
8
config.c
@ -1430,7 +1430,7 @@ static void clipboard_selector_handler(union control *ctrl, dlgparam *dlg,
|
||||
#endif
|
||||
) {
|
||||
#ifdef NAMED_CLIPBOARDS
|
||||
const char *sval = dlg_editbox_get(ctrl, dlg);
|
||||
char *sval = dlg_editbox_get(ctrl, dlg);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < lenof(options); i++)
|
||||
@ -1445,6 +1445,8 @@ static void clipboard_selector_handler(union control *ctrl, dlgparam *dlg,
|
||||
sval++;
|
||||
conf_set_str(conf, strsetting, sval);
|
||||
}
|
||||
|
||||
sfree(sval);
|
||||
#else
|
||||
int index = dlg_listbox_index(ctrl, dlg);
|
||||
if (index >= 0) {
|
||||
@ -2570,6 +2572,10 @@ void setup_config_box(struct controlbox *b, bool midsession,
|
||||
HELPCTX(ssh_hklist),
|
||||
hklist_handler, P(NULL));
|
||||
c->listbox.height = 5;
|
||||
|
||||
ctrl_checkbox(s, "Prefer algorithms for which a host key is known",
|
||||
'p', HELPCTX(ssh_hk_known), conf_checkbox_handler,
|
||||
I(CONF_ssh_prefer_known_hostkeys));
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user