net.server_select: Return handler from addclient

[prosody.git] / util / prosodyctl.lua

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index a598a44aaaa30e3b1ed52b185718b8ee0f966973..fe862114535bcc44c21906b3514249bbc90cf861 100644 (file)
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -1,7 +1,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -140,12 +140,13 @@ function adduser(params)
        if not host_session then
                return false, "no-such-host";
        end
+
+       storagemanager.initialize_host(host);
        local provider = host_session.users;
        if not(provider) or provider.name == "null" then
                usermanager.initialize_host(host);
        end
-       storagemanager.initialize_host(host);
-       
+
        local ok, errmsg = usermanager.create_user(user, password, host);
        if not ok then
                return false, errmsg;
@@ -155,12 +156,13 @@ end
 
 function user_exists(params)
        local user, host, password = nodeprep(params.user), nameprep(params.host), params.password;
+
+       storagemanager.initialize_host(host);
        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(user, host);
 end
 
@@ -168,7 +170,7 @@ function passwd(params)
        if not _M.user_exists(params) then
                return false, "no-such-user";
        end
-       
+
        return _M.adduser(params);
 end
 
@@ -176,40 +178,40 @@ function deluser(params)
        if not _M.user_exists(params) then
                return false, "no-such-user";
        end
-       params.password = nil;
-       
-       return _M.adduser(params);
+       local user, host = nodeprep(params.user), nameprep(params.host);
+
+       return usermanager.delete_user(user, host);
 end
 
 function getpid()
-       local pidfile = config.get("*", "core", "pidfile");
+       local pidfile = config.get("*", "pidfile");
        if not pidfile then
                return false, "no-pidfile";
        end
-       
-       local modules_enabled = set.new(config.get("*", "core", "modules_enabled"));
+
+       local modules_enabled = set.new(config.get("*", "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;
        end
-       
+
        local locked, err = lfs.lock(file, "w");
        if locked then
                file:close();
                return false, "pidfile-not-locked";
        end
-       
+
        local pid = tonumber(file:read("*a"));
        file:close();
-       
+
        if not pid then
                return false, "invalid-pid";
        end
-       
+
        return true, pid;
 end
 
@@ -250,10 +252,10 @@ function stop()
        if not ret then
                return false, "not-running";
        end
-       
+
        local ok, pid = _M.getpid()
        if not ok then return false, pid; end
-       
+
        signal.kill(pid, signal.SIGTERM);
        return true;
 end
@@ -266,10 +268,10 @@ function reload()
        if not ret then
                return false, "not-running";
        end
-       
+
        local ok, pid = _M.getpid()
        if not ok then return false, pid; end
-       
+
        signal.kill(pid, signal.SIGHUP);
        return true;
 end