ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-01-31 10:57:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix building when ENABLE_CLI_PUBKEY_AUTH is unset

Browse Source
This commit is contained in:
Matt Johnston 2015-06-03 21:45:32 +08:00
parent 2a431cab03
commit 91df741926
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cli-runopts.c
View File

@ -447,7 +447,7 @@ void cli_getopts(int argc, char ** argv) {
} }
#endif #endif
#ifdef DROPBEAR_DEFAULT_CLI_AUTHKEY #if defined(DROPBEAR_DEFAULT_CLI_AUTHKEY) && defined(ENABLE_CLI_PUBKEY_AUTH)
{ {
char *expand_path = expand_tilde(DROPBEAR_DEFAULT_CLI_AUTHKEY); char *expand_path = expand_tilde(DROPBEAR_DEFAULT_CLI_AUTHKEY);
loadidentityfile(expand_path, 0); loadidentityfile(expand_path, 0);
@ -498,11 +498,14 @@ multihop_passthrough_args() {
m_list_elem *iter; m_list_elem *iter;
/* Fill out -i, -y, -W options that make sense for all /* Fill out -i, -y, -W options that make sense for all
* the intermediate processes */ * the intermediate processes */
#ifdef ENABLE_CLI_PUBKEY_AUTH
for (iter = cli_opts.privkeys->first; iter; iter = iter->next) for (iter = cli_opts.privkeys->first; iter; iter = iter->next)
{ {
sign_key * key = (sign_key*)iter->item; sign_key * key = (sign_key*)iter->item;
len += 3 + strlen(key->filename); len += 3 + strlen(key->filename);
} }
#endif /* ENABLE_CLI_PUBKEY_AUTH */
len += 30; /* space for -W <size>, terminator. */ len += 30; /* space for -W <size>, terminator. */
ret = m_malloc(len); ret = m_malloc(len);
total = 0; total = 0;
@ -524,6 +527,7 @@ multihop_passthrough_args() {
total += written; total += written;
} }
#ifdef ENABLE_CLI_PUBKEY_AUTH
for (iter = cli_opts.privkeys->first; iter; iter = iter->next) for (iter = cli_opts.privkeys->first; iter; iter = iter->next)
{ {
sign_key * key = (sign_key*)iter->item; sign_key * key = (sign_key*)iter->item;
@ -532,6 +536,7 @@ multihop_passthrough_args() {
dropbear_assert((unsigned int)written < size); dropbear_assert((unsigned int)written < size);
total += written; total += written;
} }
#endif /* ENABLE_CLI_PUBKEY_AUTH */
/* if args were passed, total will be not zero, and it will have a space at the end, so remove that */ /* if args were passed, total will be not zero, and it will have a space at the end, so remove that */
if (total > 0) if (total > 0)