aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-04-27 13:11:03 +0100
committerMatthew Wild <mwild1@gmail.com>2013-04-27 13:11:03 +0100
commitc3aa6b457c732d4488276ec848a298f2cbc39780 (patch)
tree9b879f442fc3bbd26b745a241277a8fa7a03f2bf /util
parent231a76965c326988df9bceb6de5341814e1099e9 (diff)
downloadprosody-c3aa6b457c732d4488276ec848a298f2cbc39780.tar.gz
prosody-c3aa6b457c732d4488276ec848a298f2cbc39780.zip
util.prosodyctl: Initialize storagemanager on the host before initializing usermanager. This fixes brokenness when the auth provider opens the store on load (as they all do since eeea0eb2602a) (thanks nulani)
Diffstat (limited to 'util')
-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