mod_s2s: Detect TLS compression

[prosody.git] / util / prosodyctl.lua

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 128eec2cfd4bbe32f5fa8295672f58b1aa8c72f3..e38f85d47a26ea5a6d0e24e5dbea7ebb0cfde0a9 100644 (file)
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -136,11 +136,11 @@ function adduser(params)
                return false, "invalid-hostname";
        end
 
-       local host = prosody.hosts[host];
-       if not host then
+       local host_session = prosody.hosts[host];
+       if not host_session then
                return false, "no-such-host";
        end
-       local provider = host.users;
+       local provider = host_session.users;
        if not(provider) or provider.name == "null" then
                usermanager.initialize_host(host);
        end
@@ -176,9 +176,9 @@ function deluser(params)
        if not _M.user_exists(params) then
                return false, "no-such-user";
        end
-       params.password = nil;
+       local user, host = nodeprep(params.user), nameprep(params.host);
        
-       return _M.adduser(params);
+       return usermanager.delete_user(user, host);
 end
 
 function getpid()
@@ -273,3 +273,5 @@ function reload()
        signal.kill(pid, signal.SIGHUP);
        return true;
 end
+
+return _M;