Public key authentication now works in pscp too - oops

[originally from svn r574]

diff --git a/ssh.c b/ssh.c
index 7511e0854b12d0ba5e8cb606f28f119a8e007c68..499847675cae738b7f9346ec04f6cc35e05d1c13 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1204,7 +1204,7 @@ static int do_ssh1_login(unsigned char *in, int inlen, int ispkt)
         if (*cfg.keyfile && !tried_publickey)
             pwpkt_type = SSH1_CMSG_AUTH_RSA;
 
-       if (IS_SCP) {
+       if (pwpkt_type == SSH1_CMSG_AUTH_PASSWORD && IS_SCP) {
            char prompt[200];
            sprintf(prompt, "%s@%s's password: ", cfg.username, savedhost);
            if (!ssh_get_password(prompt, password, sizeof(password))) {