nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-02 03:52:49 -05:00
Code Issues Projects Releases Wiki Activity

Disable username switching between SSH2 auth attempts, and add a

Browse Source 
configurable option so users can re-enable the feature _if_ they
know they have an SSH2 server that isn't going to get shirty about
it. Inspired by a spectacular increase in OpenSSH's shirtiness.

[originally from svn r1474]
This commit is contained in:
Simon Tatham
2001-12-11 21:00:01 +00:00
parent 382ffaf026
commit 7983d2dd28
5 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
windlg.c
View File

@ -477,6 +477,7 @@ enum { IDCX_ABOUT =
IDC_PKEDIT,
IDC_PKBUTTON,
IDC_AGENTFWD,
IDC_CHANGEUSER,
IDC_AUTHTIS,
IDC_AUTHKI,
sshauthpanelend,
@ -833,6 +834,8 @@ char *help_context_cmd(int id)
return "JI(`',`ssh.auth.privkey')";
case IDC_AGENTFWD:
return "JI(`',`ssh.auth.agentfwd')";
case IDC_CHANGEUSER:
return "JI(`',`ssh.auth.changeuser')";
case IDC_AUTHTIS:
return "JI(`',`ssh.auth.tis')";
case IDC_AUTHKI:
@ -1063,6 +1066,7 @@ static void init_dlg_ctrls(HWND hwnd, int keepsess)
CheckDlgButton(hwnd, IDC_BUGGYMAC, cfg.buggymac);
CheckDlgButton(hwnd, IDC_SSH2DES, cfg.ssh2_des_cbc);
CheckDlgButton(hwnd, IDC_AGENTFWD, cfg.agentfwd);
CheckDlgButton(hwnd, IDC_CHANGEUSER, cfg.change_username);
CheckRadioButton(hwnd, IDC_SSHPROT1, IDC_SSHPROT2,
cfg.sshprot == 1 ? IDC_SSHPROT1 : IDC_SSHPROT2);
CheckDlgButton(hwnd, IDC_AUTHTIS, cfg.try_tis_auth);
@ -1674,6 +1678,8 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
beginbox(&cp, "Authentication parameters",
IDC_BOX_SSHAUTH2);
checkbox(&cp, "Allow agent &forwarding", IDC_AGENTFWD);
checkbox(&cp, "Allow attempted changes of &username in SSH2",
IDC_CHANGEUSER);
editbutton(&cp, "Private &key file for authentication:",
IDC_PKSTATIC, IDC_PKEDIT, "Bro&wse...",
IDC_PKBUTTON);
@ -2756,6 +2762,12 @@ static int GenericMainDlgProc(HWND hwnd, UINT msg,
cfg.agentfwd =
IsDlgButtonChecked(hwnd, IDC_AGENTFWD);
break;
case IDC_CHANGEUSER:
if (HIWORD(wParam) == BN_CLICKED ||
HIWORD(wParam) == BN_DOUBLECLICKED)
cfg.change_username =
IsDlgButtonChecked(hwnd, IDC_CHANGEUSER);
break;
case IDC_CIPHERLIST:
case IDC_CIPHERUP:
case IDC_CIPHERDN: