-i works with scp now.

--HG--
extra : convert_revision : 0d1ed055bb2e8b8eca60cbf1cb8cab81688dbead

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)

cli-runopts.c

@@ -149,7 +149,12 @@ void cli_getopts(int argc, char ** argv) {
 					break;
 #ifdef ENABLE_CLI_PUBKEY_AUTH
 				case 'i': /* an identityfile */
+					/* 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 */