1
0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-03 12:32:47 -05:00

Introduce a new checkbox and command-line option to inhibit use of

Pageant for local authentication. (This is a `don't use Pageant for
authentication at session startup' button rather than a `pretend
Pageant doesn't exist' button: that is, agent forwarding is
independent of this option.)

[originally from svn r6572]
This commit is contained in:
Simon Tatham
2006-02-19 12:05:12 +00:00
parent 9432d92b91
commit c2b2d9c539
10 changed files with 61 additions and 4 deletions

4
ssh.c
View File

@ -3222,7 +3222,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
while (pktin->type == SSH1_SMSG_FAILURE) {
s->pwpkt_type = SSH1_CMSG_AUTH_PASSWORD;
if (agent_exists() && !s->tried_agent) {
if (ssh->cfg.tryagent && agent_exists() && !s->tried_agent) {
/*
* Attempt RSA authentication using Pageant.
*/
@ -6613,7 +6613,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
s->nkeys = 0;
s->agent_response = NULL;
s->pkblob_in_agent = NULL;
if (agent_exists()) {
if (ssh->cfg.tryagent && agent_exists() && ssh->cfg.tryagent) {
void *r;