Merge pull request #1080 from SirCmpwn/ipc-security0.12-rc1

Revise IPC security configuration

1 files changed, 3 insertions, 5 deletions

diff --git a/sway/commands/commands.c b/sway/commands/commands.c
index 8c7ed487..0c64970c 100644
--- a/sway/commands/commands.c
+++ b/sway/commands/commands.c
@@ -10,6 +10,9 @@ struct cmd_results *cmd_commands(int argc, char **argv) {
         if ((error = checkarg(argc, "commands", EXPECTED_EQUAL_TO, 1))) {
                 return error;
         }
+        if ((error = check_security_config())) {
+                return error;
+        }
 
         if (strcmp(argv[0], "{") != 0) {
                 return cmd_results_new(CMD_FAILURE, "commands", "Expected block declaration");
@@ -19,10 +22,5 @@ struct cmd_results *cmd_commands(int argc, char **argv) {
                 return cmd_results_new(CMD_FAILURE, "commands", "Can only be used in config file.");
         }
 
-        if (!current_config_path || strcmp(SYSCONFDIR "/sway/security", current_config_path) != 0) {
-                return cmd_results_new(CMD_INVALID, "permit",
-                                "This command is only permitted to run from " SYSCONFDIR "/sway/security");
-        }
-
         return cmd_results_new(CMD_BLOCK_COMMANDS, NULL, NULL);
 }