# HG changeset patch # User Matt Johnston # Date 1244472263 0 # Node ID 6c906f903f1d587db89236e36a9f28a4760cc3bb # Parent 07a58e4da1ac62cfd66b9a057df42558ec6e6d74 Wrap proxycmd function in ENABLE_CLI_PROXYCMD #ifdef diff -r 07a58e4da1ac -r 6c906f903f1d cli-runopts.c --- a/cli-runopts.c Mon Jun 08 14:40:29 2009 +0000 +++ b/cli-runopts.c Mon Jun 08 14:44:23 2009 +0000 @@ -90,6 +90,10 @@ } +/* 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 @@ 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);