Mercurial > dropbear

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
499:f3ca5ebc319a 500:d588e3ea557a
60 "-y Always accept remote host key if unknown\n" 60 "-y Always accept remote host key if unknown\n"
61 "-s Request a subsystem (use for sftp)\n" 61 "-s Request a subsystem (use for sftp)\n"
62 #ifdef ENABLE_CLI_PUBKEY_AUTH 62 #ifdef ENABLE_CLI_PUBKEY_AUTH
63 "-i <identityfile> (multiple allowed)\n" 63 "-i <identityfile> (multiple allowed)\n"
64 #endif 64 #endif
65 #ifdef ENABLE_CLI_AGENTFWD
66 "-A Enable agent auth forwarding\n"
67 #endif
65 #ifdef ENABLE_CLI_LOCALTCPFWD 68 #ifdef ENABLE_CLI_LOCALTCPFWD
66 "-L <listenport:remotehost:remoteport> Local port forwarding\n" 69 "-L <listenport:remotehost:remoteport> Local port forwarding\n"
67 "-g Allow remote hosts to connect to forwarded ports\n" 70 "-g Allow remote hosts to connect to forwarded ports\n"
68 #endif 71 #endif
69 #ifdef ENABLE_CLI_REMOTETCPFWD 72 #ifdef ENABLE_CLI_REMOTETCPFWD
126 opts.listen_fwd_all = 0; 129 opts.listen_fwd_all = 0;
127 #endif 130 #endif
128 #ifdef ENABLE_CLI_REMOTETCPFWD 131 #ifdef ENABLE_CLI_REMOTETCPFWD
129 cli_opts.remotefwds = NULL; 132 cli_opts.remotefwds = NULL;
130 #endif 133 #endif
134 #ifdef ENABLE_CLI_AGENTFWD
135 cli_opts.agent_fwd = 0;
136 cli_opts.agent_keys_loaded = 0;
137 #endif
131 #ifdef ENABLE_CLI_PROXYCMD 138 #ifdef ENABLE_CLI_PROXYCMD
132 cli_opts.proxycmd = NULL; 139 cli_opts.proxycmd = NULL;
133 #endif 140 #endif
134 /* not yet 141 /* not yet
135 opts.ipv4 = 1; 142 opts.ipv4 = 1;
255 next = &recv_window_arg; 262 next = &recv_window_arg;
256 break; 263 break;
257 case 'K': 264 case 'K':
258 next = &keepalive_arg; 265 next = &keepalive_arg;
259 break; 266 break;
267 #ifdef ENABLE_CLI_AGENTFWD
268 case 'A':
269 cli_opts.agent_fwd = 1;
270 break;
271 #endif
260 #ifdef DEBUG_TRACE 272 #ifdef DEBUG_TRACE
261 case 'v': 273 case 'v':
262 debug_trace = 1; 274 debug_trace = 1;
263 break; 275 break;
264 #endif 276 #endif
391 403
392 nextkey = (struct SignKeyList*)m_malloc(sizeof(struct SignKeyList)); 404 nextkey = (struct SignKeyList*)m_malloc(sizeof(struct SignKeyList));
393 nextkey->key = key; 405 nextkey->key = key;
394 nextkey->next = cli_opts.privkeys; 406 nextkey->next = cli_opts.privkeys;
395 nextkey->type = keytype; 407 nextkey->type = keytype;
408 nextkey->source = SIGNKEY_SOURCE_RAW_FILE;
396 cli_opts.privkeys = nextkey; 409 cli_opts.privkeys = nextkey;
397 } 410 }
398 } 411 }
399 #endif 412 #endif
400 413