From fe03c39241b103202d7e12eb49a338ad6e24db48 Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Mon, 8 Jun 2009 14:44:23 +0000 Subject: Wrap proxycmd function in ENABLE_CLI_PROXYCMD #ifdef --HG-- extra : convert_revision : 6d6160b277bfc7c2db6888a2ac91ac618cef6de3 --- cli-runopts.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cli-runopts.c b/cli-runopts.c index 9c10fc3..986f830 100644 --- a/cli-runopts.c +++ b/cli-runopts.c @@ -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); -- cgit v1.2.3