Merge in changes from the past couple of releases

--HG--
branch : ecc

1 files changed, 7 insertions, 0 deletions

diff --git a/cli-runopts.c b/cli-runopts.c
index 91a2f42..b8d304f 100644
--- a/cli-runopts.c
+++ b/cli-runopts.c
@@ -383,6 +383,13 @@ void cli_getopts(int argc, char ** argv) {
 		exit(EXIT_FAILURE);
 	}
 
+#ifdef ENABLE_CLI_PROXYCMD                                                                                                                                   
+	if (cli_opts.proxycmd) {
+		/* To match the common path of m_freeing it */
+		cli_opts.proxycmd = m_strdup(cli_opts.proxycmd);
+	}
+#endif
+
 	if (cli_opts.remoteport == NULL) {
 		cli_opts.remoteport = "22";
 	}