The unified diff between revisions [fb7080ca..] and [833d0ade..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'cli-runopts.c'

#
#
# patch "cli-runopts.c"
#  from [1f8cf84cdb17a77e4c71c1b8fa01aa00fb728948]
#    to [6435ac6046e57fb5d30bdad5297dca84c67f828b]
#
============================================================
--- cli-runopts.c	1f8cf84cdb17a77e4c71c1b8fa01aa00fb728948
+++ cli-runopts.c	6435ac6046e57fb5d30bdad5297dca84c67f828b
@@ -56,6 +56,9 @@ static void printhelp() {
 #ifdef ENABLE_CLI_PUBKEY_AUTH
 					"-i <identityfile>   (multiple allowed)\n"
 #endif
+#ifdef ENABLE_CLI_AGENTFWD
+					"-A    Enable agent auth forwarding\n"
+#endif
 #ifdef ENABLE_CLI_LOCALTCPFWD
 					"-L <listenport:remotehost:remoteport> Local port forwarding\n"
 					"-g    Allow remote hosts to connect to forwarded ports\n"
@@ -112,6 +115,10 @@ void cli_getopts(int argc, char ** argv)
 #ifdef ENABLE_CLI_REMOTETCPFWD
 	cli_opts.remotefwds = NULL;
 #endif
+#ifdef ENABLE_CLI_AGENTFWD
+	cli_opts.agent_fwd = 0;
+	cli_opts.agent_keys_loaded = 0;
+#endif
 	/* not yet
 	opts.ipv4 = 1;
 	opts.ipv6 = 1;
@@ -215,6 +222,11 @@ void cli_getopts(int argc, char ** argv)
 				case 'K':
 					next = &keepalive_arg;
 					break;
+#ifdef ENABLE_CLI_AGENTFWD
+				case 'A':
+					cli_opts.agent_fwd = 1;
+					break;
+#endif
 #ifdef DEBUG_TRACE
 				case 'v':
 					debug_trace = 1;
@@ -345,6 +357,7 @@ static void loadidentityfile(const char*
 		nextkey->key = key;
 		nextkey->next = cli_opts.privkeys;
 		nextkey->type = keytype;
+		nextkey->source = SIGNKEY_SOURCE_RAW_FILE;
 		cli_opts.privkeys = nextkey;
 	}
 }