Mercurial > dropbear
changeset 668:405418f7dc5e
Fixed compilation with unset ENABLE_{SVR,CLI}_AGENTFWD.
Got rid of ENABLE_AGENTFWD macro.
| author | Andrey Mazo <ahippo@yandex.ru> |
|---|---|
| date | Mon, 26 Mar 2012 16:17:16 +0400 |
| parents | fc7ae88e63b3 |
| children | a8367733e8cd |
| files | agentfwd.h cli-authpubkey.c svr-authpubkeyoptions.c svr-chansession.c sysoptions.h |
| diffstat | 5 files changed, 23 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/agentfwd.h Mon Apr 09 20:35:13 2012 +0800 +++ b/agentfwd.h Mon Mar 26 16:17:16 2012 +0400 @@ -30,22 +30,19 @@ #include "auth.h" #include "list.h" +#ifdef ENABLE_CLI_AGENTFWD + /* An agent reply can be reasonably large, as it can * contain a list of all public keys held by the agent. * 10000 is arbitrary */ #define MAX_AGENT_REPLY 10000 -int svr_agentreq(struct ChanSess * chansess); -void svr_agentcleanup(struct ChanSess * chansess); -void svr_agentset(struct ChanSess *chansess); - /* client functions */ void cli_load_agent_keys(m_list * ret_list); void agent_buf_sign(buffer *sigblob, sign_key *key, const unsigned char *data, unsigned int len); void cli_setup_agent(struct Channel *channel); - #ifdef __hpux #define seteuid(a) setresuid(-1, (a), -1) #define setegid(a) setresgid(-1, (a), -1) @@ -53,4 +50,14 @@ extern const struct ChanType cli_chan_agent; +#endif /* ENABLE_CLI_AGENTFWD */ + +#ifdef ENABLE_SVR_AGENTFWD + +int svr_agentreq(struct ChanSess * chansess); +void svr_agentcleanup(struct ChanSess * chansess); +void svr_agentset(struct ChanSess *chansess); + +#endif /* ENABLE_SVR_AGENTFWD */ + #endif /* _AGENTFWD_H_ */
--- a/cli-authpubkey.c Mon Apr 09 20:35:13 2012 +0800 +++ b/cli-authpubkey.c Mon Mar 26 16:17:16 2012 +0400 @@ -123,6 +123,7 @@ 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 @@ buf_free(sigblob); } else { +#endif buf_put_sign(buf, key, type, data, len); +#ifdef ENABLE_CLI_AGENTFWD } +#endif } @@ -187,11 +191,13 @@ 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;
--- a/svr-authpubkeyoptions.c Mon Apr 09 20:35:13 2012 +0800 +++ b/svr-authpubkeyoptions.c Mon Mar 26 16:17:16 2012 +0400 @@ -143,7 +143,7 @@ ses.authstate.pubkey_options->no_port_forwarding_flag = 1; goto next_option; } -#ifdef ENABLE_AGENTFWD +#ifdef ENABLE_SVR_AGENTFWD if (match_option(options_buf, "no-agent-forwarding") == DROPBEAR_SUCCESS) { dropbear_log(LOG_WARNING, "Agent forwarding disabled."); ses.authstate.pubkey_options->no_agent_forwarding_flag = 1;
--- a/svr-chansession.c Mon Apr 09 20:35:13 2012 +0800 +++ b/svr-chansession.c Mon Mar 26 16:17:16 2012 +0400 @@ -243,7 +243,7 @@ chansess->x11authcookie = NULL; #endif -#ifdef ENABLE_AGENTFWD +#ifdef ENABLE_SVR_AGENTFWD chansess->agentlistener = NULL; chansess->agentfile = NULL; chansess->agentdir = NULL; @@ -300,7 +300,7 @@ x11cleanup(chansess); #endif -#ifdef ENABLE_AGENTFWD +#ifdef ENABLE_SVR_AGENTFWD svr_agentcleanup(chansess); #endif @@ -358,7 +358,7 @@ } else if (strcmp(type, "x11-req") == 0) { ret = x11req(chansess); #endif -#ifdef ENABLE_AGENTFWD +#ifdef ENABLE_SVR_AGENTFWD } else if (strcmp(type, "[email protected]") == 0) { ret = svr_agentreq(chansess); #endif @@ -945,7 +945,7 @@ /* set up X11 forwarding if enabled */ x11setauth(chansess); #endif -#ifdef ENABLE_AGENTFWD +#ifdef ENABLE_SVR_AGENTFWD /* set up agent env variable */ svr_agentset(chansess); #endif
--- a/sysoptions.h Mon Apr 09 20:35:13 2012 +0800 +++ b/sysoptions.h Mon Mar 26 16:17:16 2012 +0400 @@ -162,10 +162,6 @@ #define USING_LISTENERS #endif -#if defined(ENABLE_SVR_AGENTFWD) || defined(ENABLE_CLI_LOCALTCPFWD) -#define ENABLE_AGENTFWD -#endif - #if defined(ENABLE_CLI_NETCAT) && defined(ENABLE_CLI_PROXYCMD) #define ENABLE_CLI_MULTIHOP #endif