(net) state-env / tag parsing incorrect

This should fix sweep discover mode not finding the correct keys from the store due to a missing state- environment variable (blocked when launching the frameserver).
letoram · Sep 16, 2023 · cb1ce26 · cb1ce26
1 parent a289194
commit cb1ce26
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/engine/arcan_lua.c b/src/engine/arcan_lua.c
@@ -11690,6 +11690,7 @@ static int net_open(lua_State* ctx)
 
 	struct frameserver_envp args = {
 		.use_builtin = true,
+		.preserve_env = true,
 		.args.builtin.mode = "net-cl",
 		.args.builtin.resource = instr
 	};

diff --git a/src/frameserver/net/default/net.c b/src/frameserver/net/default/net.c
@@ -179,8 +179,8 @@ static bool get_keystore(
 
 	if (ks.directory.dirfd == -1){
 		ks.type = A12HELPER_PROVIDER_BASEDIR;
-		const char** err = NULL;
-		ks.directory.dirfd = a12helper_keystore_dirfd(err);
+		const char* err = NULL;
+		ks.directory.dirfd = a12helper_keystore_dirfd(&err);
 		if (-1 == ks.directory.dirfd){
 			arcan_shmif_last_words(C, KEYSTORE_ERRMSG);
 			return false;
@@ -761,6 +761,7 @@ static int connect_to_host(
  * starting with option 1. */
 	char* toksep = strrchr(work, '@');
 	if (toksep){
+		*toksep = 0;
 		opts.key = work;
 	}
 /* apparently not, 3..4 */

diff --git a/src/platform/posix/appl.c b/src/platform/posix/appl.c
@@ -111,14 +111,14 @@ bool arcan_verifyload_appl(const char* appl_id, const char** errc)
 	char* p_a = arcan_expand_resource("", RESOURCE_APPL_SHARED);
 	char* p_b = arcan_expand_resource("", RESOURCE_SYS_APPLSTATE);
 	if (!p_b)
-		arcan_override_namespace(p_a, RESOURCE_APPL_STATE);
+		arcan_softoverride_namespace(p_a, RESOURCE_APPL_STATE);
 	else if (strncmp(p_a, p_b, strlen(p_a)) == 0){
-		arcan_override_namespace(p_b, RESOURCE_APPL_STATE);
+		arcan_softoverride_namespace(p_b, RESOURCE_APPL_STATE);
 	}
 	else {
 		arcan_mem_free(p_b);
 		p_b = arcan_expand_resource(base, RESOURCE_SYS_APPLSTATE);
-		arcan_override_namespace(p_b, RESOURCE_APPL_STATE);
+		arcan_softoverride_namespace(p_b, RESOURCE_APPL_STATE);
 	}
 	arcan_mem_free(p_a);
 	arcan_mem_free(p_b);