comparison cli-authpubkey.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 c1e9c81d1d27
children 568638be7203
comparison
equal deleted inserted replaced
499:f3ca5ebc319a 500:d588e3ea557a
171 171
172 int cli_auth_pubkey() { 172 int cli_auth_pubkey() {
173 173
174 TRACE(("enter cli_auth_pubkey")) 174 TRACE(("enter cli_auth_pubkey"))
175 175
176 if (cli_opts.pubkeys == NULL &&
177 cli_opts.agent_fwd &&
178 !cli_opts.agent_keys_loaded) {
179 /* get the list of available keys from the agent */
180 load_agent_keys(&cli_opts.pubkeys);
181 }
182
176 if (cli_opts.privkeys != NULL) { 183 if (cli_opts.privkeys != NULL) {
177 /* Send a trial request */ 184 /* Send a trial request */
178 send_msg_userauth_pubkey(cli_opts.privkeys->key, 185 send_msg_userauth_pubkey(cli_opts.privkeys->key,
179 cli_opts.privkeys->type, 0); 186 cli_opts.privkeys->type, 0);
180 cli_ses.lastprivkey = cli_opts.privkeys; 187 cli_ses.lastprivkey = cli_opts.privkeys;