propagate from branch 'au.asn.ucc.matt.dropbear' (head 8a7db1e2fdc5636abb338adb636babc32f465739)

to branch 'au.asn.ucc.matt.dropbear.cli-agent' (head d82c25da2f7e4fb6da510d806c64344e80bb270d)

--HG--
branch : agent-client
extra : convert_revision : 78d02301ae8310efa2639f15da0ea62dea110e4b
This commit is contained in:
Matt Johnston
2007-08-16 13:34:37 +00:00
13 changed files with 328 additions and 17 deletions

View File

@@ -173,6 +173,13 @@ int cli_auth_pubkey() {
TRACE(("enter cli_auth_pubkey"))
if (cli_opts.pubkeys == NULL &&
cli_opts.agent_fwd &&
!cli_opts.agent_keys_loaded) {
/* get the list of available keys from the agent */
load_agent_keys(&cli_opts.pubkeys);
}
if (cli_opts.privkeys != NULL) {
/* Send a trial request */
send_msg_userauth_pubkey(cli_opts.privkeys->key,