bbe4d6ddb2
- update dropbear to latest stable 2025.88; for the changes see https://matt.ucc.asn.au/dropbear/CHANGES - rewrite 100-pubkey_path.patch - refresh remaining patches Signed-off-by: Konstantin Demin <rockdrilla@gmail.com>
69 lines
2 KiB
Diff
69 lines
2 KiB
Diff
Author: Konstantin Demin <rockdrilla@gmail.com>
|
|
Subject: Fix proxycmd without netcat
|
|
|
|
Fixes commit e5a0ef27c227 "Execute multihop commands directly, no shell"
|
|
|
|
Forwarded: https://github.com/mkj/dropbear/pull/363
|
|
|
|
src/cli-main.c | 12 +++++++++++-
|
|
1 file changed, 11 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/cli-main.c b/src/cli-main.c
|
|
index 2fafa88900..0a052a3512 100644
|
|
--- a/src/cli-main.c
|
|
+++ b/src/cli-main.c
|
|
@@ -77,7 +77,11 @@ int main(int argc, char ** argv) {
|
|
}
|
|
|
|
#if DROPBEAR_CLI_PROXYCMD
|
|
- if (cli_opts.proxycmd || cli_opts.proxyexec) {
|
|
+ if (cli_opts.proxycmd
|
|
+#if DROPBEAR_CLI_MULTIHOP
|
|
+ || cli_opts.proxyexec
|
|
+#endif
|
|
+ ) {
|
|
cli_proxy_cmd(&sock_in, &sock_out, &proxy_cmd_pid);
|
|
if (signal(SIGINT, kill_proxy_sighandler) == SIG_ERR ||
|
|
signal(SIGTERM, kill_proxy_sighandler) == SIG_ERR ||
|
|
@@ -110,11 +114,13 @@ static void shell_proxy_cmd(const void *user_data_cmd) {
|
|
dropbear_exit("Failed to run '%s'\n", cmd);
|
|
}
|
|
|
|
+#if DROPBEAR_CLI_MULTIHOP
|
|
static void exec_proxy_cmd(const void *unused) {
|
|
(void)unused;
|
|
run_command(cli_opts.proxyexec[0], cli_opts.proxyexec, ses.maxfd);
|
|
dropbear_exit("Failed to run '%s'\n", cli_opts.proxyexec[0]);
|
|
}
|
|
+#endif
|
|
|
|
static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out) {
|
|
char * cmd_arg = NULL;
|
|
@@ -145,9 +151,11 @@ static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out) {
|
|
cmd_arg = m_malloc(shell_cmdlen);
|
|
snprintf(cmd_arg, shell_cmdlen, "exec %s", cli_opts.proxycmd);
|
|
exec_fn = shell_proxy_cmd;
|
|
+#if DROPBEAR_CLI_MULTIHOP
|
|
} else {
|
|
/* No shell */
|
|
exec_fn = exec_proxy_cmd;
|
|
+#endif
|
|
}
|
|
|
|
ret = spawn_command(exec_fn, cmd_arg, sock_out, sock_in, NULL, pid_out);
|
|
@@ -159,6 +167,7 @@ static void cli_proxy_cmd(int *sock_in, int *sock_out, pid_t *pid_out) {
|
|
cleanup:
|
|
m_free(cli_opts.proxycmd);
|
|
m_free(cmd_arg);
|
|
+#if DROPBEAR_CLI_MULTIHOP
|
|
if (cli_opts.proxyexec) {
|
|
char **a = NULL;
|
|
for (a = cli_opts.proxyexec; *a; a++) {
|
|
@@ -166,6 +175,7 @@ cleanup:
|
|
}
|
|
m_free(cli_opts.proxyexec);
|
|
}
|
|
+#endif
|
|
}
|
|
|
|
static void kill_proxy_sighandler(int UNUSED(signo)) {
|