Merge branch 'obsd-master'

2025-09-04 23:56:58 +00:00 · 2015-04-20 15:44:27 +01:00
parent acb8248ba6 0fd9a97202
commit b25dc423b0
30 changed files with 1106 additions and 661 deletions
--- a/cfg.c
+++ b/cfg.c
@ -74,7 +74,7 @@ load_cfg(const char *path, struct cmd_q *cmdq, char **cause)

 		if (cmdlist == NULL)
 			continue;
-		cmdq_append(cmdq, cmdlist);
+		cmdq_append(cmdq, cmdlist, NULL);
 		cmd_list_free(cmdlist);
 		found++;
 	}