diff cli-runopts.c @ 500:d588e3ea557a agent-client

propagate from branch 'au.asn.ucc.matt.dropbear' (head 4fb35083f0f46ea667e7043e7d4314aecd3df46c) to branch 'au.asn.ucc.matt.dropbear.cli-agent' (head 833d0adef6cdbf43ea75283524c665e70b0ee1ee)
author Matt Johnston <matt@ucc.asn.au>
date Tue, 23 Sep 2008 16:05:04 +0000
parents ae600f1eef81 33d5e9fb0f78
children 568638be7203
line wrap: on
line diff
--- a/cli-runopts.c	Tue Sep 23 16:02:51 2008 +0000
+++ b/cli-runopts.c	Tue Sep 23 16:05:04 2008 +0000
@@ -62,6 +62,9 @@
 #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"
@@ -128,6 +131,10 @@
 #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
 #ifdef ENABLE_CLI_PROXYCMD
 	cli_opts.proxycmd = NULL;
 #endif
@@ -257,6 +264,11 @@
 				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;
@@ -393,6 +405,7 @@
 		nextkey->key = key;
 		nextkey->next = cli_opts.privkeys;
 		nextkey->type = keytype;
+		nextkey->source = SIGNKEY_SOURCE_RAW_FILE;
 		cli_opts.privkeys = nextkey;
 	}
 }