From 08cb9037316e02fd23f6e5d66802478c18bab009 Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Sun, 17 Oct 2004 10:35:19 +0000 Subject: [PATCH] -i works with scp now. --HG-- extra : convert_revision : 0d1ed055bb2e8b8eca60cbf1cb8cab81688dbead --- CHANGES | 14 ++++++++++++++ cli-runopts.c | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 07e931a..18c71f9 100644 --- a/CHANGES +++ b/CHANGES @@ -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 */