From a21cf67a6c5bfed10175c9cdeee312d697aa3343 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Mon, 8 Jun 2009 14:51:22 +0000
Subject: [PATCH] disapproval of revision
 '6d6160b277bfc7c2db6888a2ac91ac618cef6de3'

--HG--
extra : convert_revision : 64088637337d7b6024a9b48b9a616eecf8621cf6
---
 cli-runopts.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/cli-runopts.c b/cli-runopts.c
index 986f830..9c10fc3 100644
--- a/cli-runopts.c
+++ b/cli-runopts.c
@@ -90,10 +90,6 @@ 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;
@@ -473,9 +469,9 @@ static void parse_multihop_hostname(const char* orighostarg, const char* argv0)
 		if (cli_opts.remoteport == NULL) {
 			cli_opts.remoteport = "22";
 		}
-		cmd_len = strlen(argv0) + strlen(remainder) 
+		cmd_len = strlen(remainder) 
 			+ strlen(cli_opts.remotehost) + strlen(cli_opts.remoteport)
-			+ 30;
+			+ strlen(argv0) + 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);