diff options
author | Matt Johnston <matt@ucc.asn.au> | 2004-10-17 10:35:19 +0000 |
---|---|---|
committer | Matt Johnston <matt@ucc.asn.au> | 2004-10-17 10:35:19 +0000 |
commit | 2fc85702fe51dd77171e1652659d652c0f325e4a (patch) | |
tree | b929749a673411d911ce8068fac06fbfd6cbaf4c | |
parent | f2c03770a9dcaf54cf360ebdf7182ac8cee1dd0d (diff) | |
download | dropbear-2fc85702fe51dd77171e1652659d652c0f325e4a.tar.gz |
-i works with scp now.
-rw-r--r-- | CHANGES | 14 | ||||
-rw-r--r-- | cli-runopts.c | 7 |
2 files changed, 20 insertions, 1 deletions
@@ -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) diff --git a/cli-runopts.c b/cli-runopts.c index 2aa3413..b8ecdc0 100644 --- a/cli-runopts.c +++ b/cli-runopts.c @@ -149,7 +149,12 @@ void cli_getopts(int argc, char ** argv) { 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 */ |