Fix const argument for apply_config_settings(), add CI

DROPBEAR_USE_SSH_CONFIG wasn't being tested
mkj · Apr 4, 2024 · 5a37e37 · 5a37e37
1 parent 12f70d8
commit 5a37e37
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -87,6 +87,8 @@ jobs:
           - name: nondefault options
             nondefault: 1
             configure_flags: --enable-pam
+            localoptions: |
+              #define DROPBEAR_USE_SSH_CONFIG 1
 
           - name: most options disabled
             configure_flags: --disable-harden --disable-zlib --disable-openpty --disable-lastlog

diff --git a/src/cli-runopts.c b/src/cli-runopts.c
@@ -46,7 +46,7 @@ static void add_netcat(const char *str);
 static void add_extendedopt(const char *str);
 
 #if DROPBEAR_USE_SSH_CONFIG
-void apply_config_settings(char* cli_host_arg);
+static void apply_config_settings(const char* cli_host_arg);
 #endif
 
 static void printhelp() {
@@ -1050,7 +1050,7 @@ static void add_extendedopt(const char* origstr) {
 }
 
 #if DROPBEAR_USE_SSH_CONFIG
-void apply_config_settings(char* cli_host_arg) {
+static void apply_config_settings(const char* cli_host_arg) {
 	char* is_multi_hop_host_target = strchr(cli_host_arg, ',');
 	if (!is_multi_hop_host_target) {
 		char* config_path = expand_homedir_path(DROPBEAR_DEFAULT_SSH_CONFIG);