Mercurial > dropbear
changeset 134:6b306ad5f5b5
-i works with scp now.
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Sun, 17 Oct 2004 10:35:19 +0000 |
| parents | b4cfe976c8e1 |
| children | d663445c1533 |
| files | CHANGES cli-runopts.c |
| diffstat | 2 files changed, 20 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/CHANGES Sun Oct 17 08:19:47 2004 +0000 +++ b/CHANGES Sun Oct 17 10:35:19 2004 +0000 @@ -1,3 +1,17 @@ +0.44test5 - + +- Fix dbclient so that "scp -i keyfile" works. (It can handle "-ikeyfile + properly) + +- Fix for PAM auth so that usernames are logged and conversation function + responses are allocated correctly. + +- Avoid a race in server shell-handling code which prevents the exit-code + from being returned to the client. + +- Makefile modified so that install target works correctly (doesn't try + to install "all" binary) - patch from Juergen Daubert + 0.44test4 - Tue Sept 14 21:15:54 +0800 - Fix inetd mode so it actually loads the hostkeys (oops)
--- a/cli-runopts.c Sun Oct 17 08:19:47 2004 +0000 +++ b/cli-runopts.c Sun Oct 17 10:35:19 2004 +0000 @@ -149,7 +149,12 @@ break; #ifdef ENABLE_CLI_PUBKEY_AUTH case 'i': /* an identityfile */ - nextiskey = 1; + /* Keep scp happy when it changes "-i file" to "-ifile" */ + if (strlen(argv[i]) > 2) { + loadidentityfile(&argv[i][2]); + } else { + nextiskey = 1; + } break; #endif case 't': /* we want a pty */