Mercurial > dropbear
diff cli-agentfwd.c @ 989:73ea0dce9a57 pam
Merge up to date
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Fri, 23 Jan 2015 21:38:47 +0800 |
| parents | 9bf46570868f |
| children | 16584026a1f0 |
line wrap: on
line diff
--- a/cli-agentfwd.c Wed Mar 12 23:40:02 2014 +0800 +++ b/cli-agentfwd.c Fri Jan 23 21:38:47 2015 +0800 @@ -210,13 +210,14 @@ ret = buf_get_pub_key(key_buf, pubkey, &key_type); buf_free(key_buf); if (ret != DROPBEAR_SUCCESS) { - /* This is slack, properly would cleanup vars etc */ - dropbear_exit("Bad pubkey received from agent"); + TRACE(("Skipping bad/unknown type pubkey from agent")); + sign_key_free(pubkey); + } else { + pubkey->type = key_type; + pubkey->source = SIGNKEY_SOURCE_AGENT; + + list_append(ret_list, pubkey); } - pubkey->type = key_type; - pubkey->source = SIGNKEY_SOURCE_AGENT; - - list_append(ret_list, pubkey); /* We'll ignore the comment for now. might want it later.*/ buf_eatstring(inbuf); @@ -234,7 +235,7 @@ return; } - cli_start_send_channel_request(channel, "[email protected]"); + start_send_channel_request(channel, "[email protected]"); /* Don't want replies */ buf_putbyte(ses.writepayload, 0); encrypt_packet();