diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2008-09-23 16:05:04 +0000 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2008-09-23 16:05:04 +0000 |
| commit | e674c73ee62c79608dc986ca4eda4d8299f2e324 (patch) | |
| tree | c14f9f6bc8a5d5ffb182db4966b154943830fef4 /cli-runopts.c | |
| parent | 90f8c1fd51ac6af033d455a775dc5a1455d7d7cb (diff) | |
| parent | bb84e33d99f5cbdb362940fc5eb7e4548df4cf23 (diff) | |
propagate from branch 'au.asn.ucc.matt.dropbear' (head 4fb35083f0f46ea667e7043e7d4314aecd3df46c)
to branch 'au.asn.ucc.matt.dropbear.cli-agent' (head 833d0adef6cdbf43ea75283524c665e70b0ee1ee)
--HG--
branch : agent-client
extra : convert_revision : 6bbab8364de17bd9ecb1dee5ffb796e48c0380d2
Diffstat (limited to 'cli-runopts.c')
| -rw-r--r-- | cli-runopts.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/cli-runopts.c b/cli-runopts.c index be449a3..d49caa2 100644 --- a/cli-runopts.c +++ b/cli-runopts.c @@ -62,6 +62,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" @@ -128,6 +131,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 #ifdef ENABLE_CLI_PROXYCMD cli_opts.proxycmd = NULL; #endif @@ -257,6 +264,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; @@ -393,6 +405,7 @@ static void loadidentityfile(const char* filename) { nextkey->key = key; nextkey->next = cli_opts.privkeys; nextkey->type = keytype; + nextkey->source = SIGNKEY_SOURCE_RAW_FILE; cli_opts.privkeys = nextkey; } } |