Fix build with DROPBEAR_SVR_LOCALTCPFWD=0, DROPBEAR_SVR_LOCALSTREAMFWD=1

HansH111 · Apr 3, 2024 · 9b72921 · 9b72921
1 parent 796a89e
commit 9b72921
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/runopts.h b/src/runopts.h
@@ -113,7 +113,7 @@ typedef struct svr_runopts {
 #if DROPBEAR_SVR_REMOTETCPFWD
 	int noremotetcp;
 #endif
-#if DROPBEAR_SVR_LOCALTCPFWD
+#if DROPBEAR_SVR_LOCALANYFWD
 	int nolocaltcp;
 #endif
 

diff --git a/src/svr-runopts.c b/src/svr-runopts.c
@@ -85,7 +85,7 @@ static void printhelp(const char * progname) {
 					"-t		Enable two-factor authentication (both password and public key required)\n"
 #endif
 					"-T		Maximum authentication tries (default %d)\n"
-#if DROPBEAR_SVR_LOCALTCPFWD
+#if DROPBEAR_SVR_LOCALANYFWD
 					"-j		Disable local port forwarding\n"
 #endif
 #if DROPBEAR_SVR_REMOTETCPFWD
@@ -173,7 +173,7 @@ void svr_getopts(int argc, char ** argv) {
 	svr_opts.hostkey = NULL;
 	svr_opts.delay_hostkey = 0;
 	svr_opts.pidfile = expand_homedir_path(DROPBEAR_PIDFILE);
-#if DROPBEAR_SVR_LOCALTCPFWD
+#if DROPBEAR_SVR_LOCALANYFWD
 	svr_opts.nolocaltcp = 0;
 #endif
 #if DROPBEAR_SVR_REMOTETCPFWD
@@ -240,7 +240,7 @@ void svr_getopts(int argc, char ** argv) {
 					svr_opts.pass_on_env = 1;
 					break;
 
-#if DROPBEAR_SVR_LOCALTCPFWD
+#if DROPBEAR_SVR_LOCALANYFWD
 				case 'j':
 					svr_opts.nolocaltcp = 1;
 					break;

diff --git a/src/sysoptions.h b/src/sysoptions.h
@@ -266,9 +266,12 @@
 
 #define DROPBEAR_TCP_ACCEPT ((DROPBEAR_CLI_LOCALTCPFWD) || (DROPBEAR_SVR_REMOTETCPFWD))
 
+/* TCP and stream local fwds share the same restrictions */
+#define DROPBEAR_SVR_LOCALANYFWD ((DROPBEAR_SVR_LOCALTCPFWD) || (DROPBEAR_SVR_LOCALSTREAMFWD))
+
 #define DROPBEAR_LISTENERS \
    ((DROPBEAR_CLI_REMOTETCPFWD) || (DROPBEAR_CLI_LOCALTCPFWD) || \
-	(DROPBEAR_SVR_REMOTETCPFWD) || (DROPBEAR_SVR_LOCALTCPFWD) || \
+	(DROPBEAR_SVR_REMOTETCPFWD) || (DROPBEAR_SVR_LOCALANYFWD) || \
 	(DROPBEAR_SVR_AGENTFWD) || (DROPBEAR_X11FWD))
 
 #define DROPBEAR_CLI_MULTIHOP ((DROPBEAR_CLI_NETCAT) && (DROPBEAR_CLI_PROXYCMD))