Fixed compilation with unset ENABLE_{SVR,CLI}_AGENTFWD.

Got rid of ENABLE_AGENTFWD macro.
This commit is contained in:
Andrey Mazo
2012-03-26 16:17:16 +04:00
parent 49b79fa02d
commit d4a14fcb3d
5 changed files with 23 additions and 14 deletions

View File

@@ -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;