From 08cb9037316e02fd23f6e5d66802478c18bab009 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Sun, 17 Oct 2004 10:35:19 +0000
Subject: -i works with scp now.

--HG--
extra : convert_revision : 0d1ed055bb2e8b8eca60cbf1cb8cab81688dbead
---
 cli-runopts.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'cli-runopts.c')

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 */
-- 
cgit v1.2.3