aboutsummaryrefslogtreecommitdiffstats
path: root/util/prosodyctl.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-04-10 13:16:54 +0200
committerKim Alvefur <zash@zash.se>2014-04-10 13:16:54 +0200
commita415748985aa2ec998caabb5baf1d7f083d6076a (patch)
tree521b9634144ac84ea608dbe47a15a0bcd1951695 /util/prosodyctl.lua
parenteae27a73d7439930ebe9732d72b14c795b17c528 (diff)
parentb9751f2455a3a7a72c2505d3fc8296ee722726cc (diff)
downloadprosody-a415748985aa2ec998caabb5baf1d7f083d6076a.tar.gz
prosody-a415748985aa2ec998caabb5baf1d7f083d6076a.zip
Merge 0.10->trunk
Diffstat (limited to 'util/prosodyctl.lua')
-rw-r--r--util/prosodyctl.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index fe862114..d59c163c 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -189,8 +189,8 @@ function getpid()
return false, "no-pidfile";
end
- local modules_enabled = set.new(config.get("*", "modules_enabled"));
- if not modules_enabled:contains("posix") then
+ local modules_enabled = set.new(config.get("*", "modules_disabled"));
+ if prosody.platform ~= "posix" or modules_enabled:contains("posix") then
return false, "no-posix";
end