summaryrefslogtreecommitdiffhomepage
path: root/cli-authpubkey.c
diff options
context:
space:
mode:
authorAndrey Mazo <ahippo@yandex.ru>2012-03-26 16:17:16 +0400
committerAndrey Mazo <ahippo@yandex.ru>2012-03-26 16:17:16 +0400
commitd4a14fcb3dde43e21b0bdf1e244d3b8f7aa488de (patch)
tree6f853fdf1f5ebf7d5c4d72b1aff8d50ae27611c7 /cli-authpubkey.c
parent49b79fa02d93a507df6caf93d3f4545ab057bea5 (diff)
Fixed compilation with unset ENABLE_{SVR,CLI}_AGENTFWD.
Got rid of ENABLE_AGENTFWD macro.
Diffstat (limited to 'cli-authpubkey.c')
-rw-r--r--cli-authpubkey.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/cli-authpubkey.c b/cli-authpubkey.c
index a57fd6b..cf506b8 100644
--- a/cli-authpubkey.c
+++ b/cli-authpubkey.c
@@ -123,6 +123,7 @@ void recv_msg_userauth_pk_ok() {
void cli_buf_put_sign(buffer* buf, sign_key *key, int type,
const unsigned char *data, unsigned int len)
{
+#ifdef ENABLE_CLI_AGENTFWD
if (key->source == SIGNKEY_SOURCE_AGENT) {
/* Format the agent signature ourselves, as buf_put_sign would. */
buffer *sigblob;
@@ -134,8 +135,11 @@ void cli_buf_put_sign(buffer* buf, sign_key *key, int type,
buf_free(sigblob);
} else {
+#endif
buf_put_sign(buf, key, type, data, len);
+#ifdef ENABLE_CLI_AGENTFWD
}
+#endif
}
@@ -187,11 +191,13 @@ int cli_auth_pubkey() {
TRACE(("enter cli_auth_pubkey"))
+#ifdef ENABLE_CLI_AGENTFWD
if (!cli_opts.agent_keys_loaded) {
/* get the list of available keys from the agent */
cli_load_agent_keys(cli_opts.privkeys);
cli_opts.agent_keys_loaded = 1;
}
+#endif
if (cli_opts.privkeys->first) {
sign_key * key = (sign_key*)cli_opts.privkeys->first->item;