Mercurial > dropbear
diff cli-runopts.c @ 835:4095b6d7c9fc ecc
Merge in changes from the past couple of releases
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Fri, 18 Oct 2013 21:38:01 +0800 |
parents | c936abfa9935 |
children | 7540c0822374 |
line wrap: on
line diff
--- a/cli-runopts.c Sat May 25 00:54:19 2013 +0800 +++ b/cli-runopts.c Fri Oct 18 21:38:01 2013 +0800 @@ -383,6 +383,13 @@ 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"; }