Mercurial > dropbear
diff cli-runopts.c @ 1733:d529a52b2f7c coverity coverity
merge coverity from main
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Fri, 26 Jun 2020 21:07:34 +0800 |
parents | f8d8af12ac14 |
children | df8d8ec1801c |
line wrap: on
line diff
--- a/cli-runopts.c Thu Mar 21 23:28:59 2019 +0800 +++ b/cli-runopts.c Fri Jun 26 21:07:34 2020 +0800 @@ -214,7 +214,7 @@ cli_opts.always_accept_key = 1; break; case 'p': /* remoteport */ - next = &cli_opts.remoteport; + next = (char**)&cli_opts.remoteport; break; #if DROPBEAR_CLI_PUBKEY_AUTH case 'i': /* an identityfile */ @@ -378,6 +378,11 @@ } } +#if DROPBEAR_USER_ALGO_LIST + /* -c help doesn't need a hostname */ + parse_ciphers_macs(); +#endif + /* Done with options/flags; now handle the hostname (which may not * start with a hyphen) and optional command */ @@ -408,10 +413,6 @@ /* And now a few sanity checks and setup */ -#if DROPBEAR_USER_ALGO_LIST - parse_ciphers_macs(); -#endif - #if DROPBEAR_CLI_PROXYCMD if (cli_opts.proxycmd) { /* To match the common path of m_freeing it */