mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-10 09:58:01 +00:00
logeventf()'s first argument is ssh, not ssh->frontend! This is what
I get for making the latter a `void *' - type checking deserts me in my hour of need. Should fix Andrey Borzenkov's bug. [originally from svn r2340]
This commit is contained in:
parent
368ee4856b
commit
29b0705961
6
ssh.c
6
ssh.c
@ -4375,8 +4375,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
|
|||||||
/* Load the pub half of cfg.keyfile so we notice if it's in Pageant */
|
/* Load the pub half of cfg.keyfile so we notice if it's in Pageant */
|
||||||
if (*cfg.keyfile) {
|
if (*cfg.keyfile) {
|
||||||
int keytype;
|
int keytype;
|
||||||
logeventf(ssh->frontend,
|
logeventf(ssh, "Reading private key file \"%.150s\"", cfg.keyfile);
|
||||||
"Reading private key file \"%.150s\"", cfg.keyfile);
|
|
||||||
keytype = key_type(cfg.keyfile);
|
keytype = key_type(cfg.keyfile);
|
||||||
if (keytype == SSH_KEYTYPE_SSH2) {
|
if (keytype == SSH_KEYTYPE_SSH2) {
|
||||||
s->publickey_blob =
|
s->publickey_blob =
|
||||||
@ -4384,8 +4383,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen, int ispkt)
|
|||||||
&s->publickey_bloblen);
|
&s->publickey_bloblen);
|
||||||
} else {
|
} else {
|
||||||
char *msgbuf;
|
char *msgbuf;
|
||||||
logeventf(ssh->frontend,
|
logeventf(ssh, "Unable to use this key file (%s)",
|
||||||
"Unable to use this key file (%s)",
|
|
||||||
key_type_to_str(keytype));
|
key_type_to_str(keytype));
|
||||||
msgbuf = dupprintf("Unable to use key file \"%.150s\""
|
msgbuf = dupprintf("Unable to use key file \"%.150s\""
|
||||||
" (%s)\r\n", cfg.keyfile,
|
" (%s)\r\n", cfg.keyfile,
|
||||||
|
Loading…
Reference in New Issue
Block a user