mod_pubsub, util.pubsub: Remove from 0.8

[prosody.git] / util / prosodyctl.lua

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 1be67883ecc8a06f2656c5733766ed1aadb45aaf..40d21be86b617ac8a82230b88561720c28c96e10 100644 (file)
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -10,8 +10,10 @@
 local config = require "core.configmanager";
 local encodings = require "util.encodings";
 local stringprep = encodings.stringprep;
+local storagemanager = require "core.storagemanager";
 local usermanager = require "core.usermanager";
 local signal = require "util.signal";
+local set = require "util.set";
 local lfs = require "lfs";
 
 local nodeprep, nameprep = stringprep.nodeprep, stringprep.nameprep;
@@ -37,21 +39,24 @@ function adduser(params)
        if not(provider) or provider.name == "null" then
                usermanager.initialize_host(host);
        end
+       storagemanager.initialize_host(host);
        
-       local ok = usermanager.create_user(user, password, host);
+       local ok, errmsg = usermanager.create_user(user, password, host);
        if not ok then
-               return false, "unable-to-save-data";
+               return false, errmsg;
        end
        return true;
 end
 
 function user_exists(params)
+       local user, host, password = nodeprep(params.user), nameprep(params.host), params.password;
        local provider = prosody.hosts[host].users;
        if not(provider) or provider.name == "null" then
                usermanager.initialize_host(host);
        end
+       storagemanager.initialize_host(host);
        
-       return usermanager.user_exists(params.user, params.host);
+       return usermanager.user_exists(user, host);
 end
 
 function passwd(params)
@@ -77,6 +82,11 @@ function getpid()
                return false, "no-pidfile";
        end
        
+       local modules_enabled = set.new(config.get("*", "core", "modules_enabled"));
+       if not modules_enabled:contains("posix") then
+               return false, "no-posix";
+       end
+       
        local file, err = io.open(pidfile, "r+");
        if not file then
                return false, "pidfile-read-failed", err;