Commit fe03c392 authored by Matt Johnston's avatar Matt Johnston
Browse files

Wrap proxycmd function in ENABLE_CLI_PROXYCMD #ifdef

--HG--
extra : convert_revision : 6d6160b277bfc7c2db6888a2ac91ac618cef6de3
parent 6e78eca7
......@@ -90,6 +90,10 @@ static void printhelp() {
}
/* Note that options that affect the transport or auth layers (such as -i or
* -W) should also be passed through to a multi-hop child proxycmd, in
* parse_multihop_hostname(). */
void cli_getopts(int argc, char ** argv) {
unsigned int i, j;
......@@ -469,9 +473,9 @@ static void parse_multihop_hostname(const char* orighostarg, const char* argv0)
if (cli_opts.remoteport == NULL) {
cli_opts.remoteport = "22";
}
cmd_len = strlen(remainder)
cmd_len = strlen(argv0) + strlen(remainder)
+ strlen(cli_opts.remotehost) + strlen(cli_opts.remoteport)
+ strlen(argv0) + 30;
+ 30;
cli_opts.proxycmd = m_malloc(cmd_len);
snprintf(cli_opts.proxycmd, cmd_len, "%s -B %s:%s %s",
argv0, cli_opts.remotehost, cli_opts.remoteport, remainder);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment