Mercurial > dropbear
comparison cli-runopts.c @ 458:c1e9c81d1d27 agent-client
propagate from branch 'au.asn.ucc.matt.dropbear' (head 8a7db1e2fdc5636abb338adb636babc32f465739)
to branch 'au.asn.ucc.matt.dropbear.cli-agent' (head d82c25da2f7e4fb6da510d806c64344e80bb270d)
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Thu, 16 Aug 2007 13:34:37 +0000 |
parents | 7e43f5e473b9 79bf1023cf11 |
children | 33d5e9fb0f78 |
comparison
equal
deleted
inserted
replaced
457:e430a26064ee | 458:c1e9c81d1d27 |
---|---|
54 "-f Run in background after auth\n" | 54 "-f Run in background after auth\n" |
55 "-y Always accept remote host key if unknown\n" | 55 "-y Always accept remote host key if unknown\n" |
56 #ifdef ENABLE_CLI_PUBKEY_AUTH | 56 #ifdef ENABLE_CLI_PUBKEY_AUTH |
57 "-i <identityfile> (multiple allowed)\n" | 57 "-i <identityfile> (multiple allowed)\n" |
58 #endif | 58 #endif |
59 #ifdef ENABLE_CLI_AGENTFWD | |
60 "-A Enable agent auth forwarding\n" | |
61 #endif | |
59 #ifdef ENABLE_CLI_LOCALTCPFWD | 62 #ifdef ENABLE_CLI_LOCALTCPFWD |
60 "-L <listenport:remotehost:remoteport> Local port forwarding\n" | 63 "-L <listenport:remotehost:remoteport> Local port forwarding\n" |
61 "-g Allow remote hosts to connect to forwarded ports\n" | 64 "-g Allow remote hosts to connect to forwarded ports\n" |
62 #endif | 65 #endif |
63 #ifdef ENABLE_CLI_REMOTETCPFWD | 66 #ifdef ENABLE_CLI_REMOTETCPFWD |
107 opts.listen_fwd_all = 0; | 110 opts.listen_fwd_all = 0; |
108 #endif | 111 #endif |
109 #ifdef ENABLE_CLI_REMOTETCPFWD | 112 #ifdef ENABLE_CLI_REMOTETCPFWD |
110 cli_opts.remotefwds = NULL; | 113 cli_opts.remotefwds = NULL; |
111 #endif | 114 #endif |
115 #ifdef ENABLE_CLI_AGENTFWD | |
116 cli_opts.agent_fwd = 0; | |
117 cli_opts.agent_keys_loaded = 0; | |
118 #endif | |
112 /* not yet | 119 /* not yet |
113 opts.ipv4 = 1; | 120 opts.ipv4 = 1; |
114 opts.ipv6 = 1; | 121 opts.ipv6 = 1; |
115 */ | 122 */ |
116 opts.recv_window = DEFAULT_RECV_WINDOW; | 123 opts.recv_window = DEFAULT_RECV_WINDOW; |
212 next = &recv_window_arg; | 219 next = &recv_window_arg; |
213 break; | 220 break; |
214 case 'K': | 221 case 'K': |
215 next = &keepalive_arg; | 222 next = &keepalive_arg; |
216 break; | 223 break; |
224 #ifdef ENABLE_CLI_AGENTFWD | |
225 case 'A': | |
226 cli_opts.agent_fwd = 1; | |
227 break; | |
228 #endif | |
217 #ifdef DEBUG_TRACE | 229 #ifdef DEBUG_TRACE |
218 case 'v': | 230 case 'v': |
219 debug_trace = 1; | 231 debug_trace = 1; |
220 break; | 232 break; |
221 #endif | 233 #endif |
342 | 354 |
343 nextkey = (struct SignKeyList*)m_malloc(sizeof(struct SignKeyList)); | 355 nextkey = (struct SignKeyList*)m_malloc(sizeof(struct SignKeyList)); |
344 nextkey->key = key; | 356 nextkey->key = key; |
345 nextkey->next = cli_opts.privkeys; | 357 nextkey->next = cli_opts.privkeys; |
346 nextkey->type = keytype; | 358 nextkey->type = keytype; |
359 nextkey->source = SIGNKEY_SOURCE_RAW_FILE; | |
347 cli_opts.privkeys = nextkey; | 360 cli_opts.privkeys = nextkey; |
348 } | 361 } |
349 } | 362 } |
350 #endif | 363 #endif |
351 | 364 |