diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-04-27 13:11:27 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-04-27 13:11:27 +0100 |
| commit | 5e1775847b7a5c5ef7757cd6efa0b4d6c48baab7 (patch) | |
| tree | 9b879f442fc3bbd26b745a241277a8fa7a03f2bf | |
| parent | 240c5480a9abde4de5eab78c4da287e4e3de7509 (diff) | |
| parent | c3aa6b457c732d4488276ec848a298f2cbc39780 (diff) | |
| download | prosody-5e1775847b7a5c5ef7757cd6efa0b4d6c48baab7.tar.gz prosody-5e1775847b7a5c5ef7757cd6efa0b4d6c48baab7.zip | |
Merge 0.9->trunk
| -rw-r--r-- | util/prosodyctl.lua | 6 |
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 |