diff options
| author | Matt Johnston <matt@ucc.asn.au> | 2016-07-21 23:38:42 +0800 |
|---|---|---|
| committer | Matt Johnston <matt@ucc.asn.au> | 2016-07-21 23:38:42 +0800 |
| commit | 27bb6e6b99c5890296e6ceb25f7b4159e61441af (patch) | |
| tree | 486c12b144b2c4ce7bff731cae3c4b12b66807cd /cli-main.c | |
| parent | 97d87da24ccad7e78533324ec0cb8436ba4955b6 (diff) | |
| parent | 278a927898722435c4208cf15a43fb2de39dc176 (diff) | |
| download | dropbear-27bb6e6b99c5890296e6ceb25f7b4159e61441af.tar.gz | |
merge 2016.74
Diffstat (limited to 'cli-main.c')
| -rw-r--r-- | cli-main.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -35,13 +35,13 @@ static void cli_dropbear_exit(int exitcode, const char* format, va_list param) ATTRIB_NORETURN; static void cli_dropbear_log(int priority, const char* format, va_list param); -#ifdef ENABLE_CLI_PROXYCMD +#if DROPBEAR_CLI_PROXYCMD static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out); static void kill_proxy_sighandler(int signo); #endif -#if defined(DBMULTI_dbclient) || !defined(DROPBEAR_MULTI) -#if defined(DBMULTI_dbclient) && defined(DROPBEAR_MULTI) +#if defined(DBMULTI_dbclient) || !DROPBEAR_MULTI +#if defined(DBMULTI_dbclient) && DROPBEAR_MULTI int cli_main(int argc, char ** argv) { #else int main(int argc, char ** argv) { @@ -74,7 +74,7 @@ int main(int argc, char ** argv) { } pid_t proxy_cmd_pid = 0; -#ifdef ENABLE_CLI_PROXYCMD +#if DROPBEAR_CLI_PROXYCMD if (cli_opts.proxycmd) { cli_proxy_cmd(&sock_in, &sock_out, &proxy_cmd_pid); m_free(cli_opts.proxycmd); @@ -151,7 +151,7 @@ static void exec_proxy_cmd(void *user_data_cmd) { dropbear_exit("Failed to run '%s'\n", cmd); } -#ifdef ENABLE_CLI_PROXYCMD +#if DROPBEAR_CLI_PROXYCMD static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out) { char * ex_cmd = NULL; size_t ex_cmdlen; @@ -176,4 +176,4 @@ static void kill_proxy_sighandler(int UNUSED(signo)) { kill_proxy_command(); _exit(1); } -#endif /* ENABLE_CLI_PROXYCMD */ +#endif /* DROPBEAR_CLI_PROXYCMD */ |