aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-27 13:11:27 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-27 13:11:27 +0100
commitfe7921945ccf504691a774adf1f94465e975b836 (patch)
tree9b879f442fc3bbd26b745a241277a8fa7a03f2bf
parent68a25371ea0d8f8722fab24c840c85f9ec91da7d (diff)
parentfbee5003f73a49a392e5fa015ff8589e990ce25e (diff)
downloadprosody-fe7921945ccf504691a774adf1f94465e975b836.tar.gz
prosody-fe7921945ccf504691a774adf1f94465e975b836.zip
Merge 0.9->trunk
-rw-r--r--util/prosodyctl.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 1ab1d0bb..b80a69f2 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -140,11 +140,12 @@ 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
@@ -155,11 +156,12 @@ 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