aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-02-11 14:51:29 +0000
committerMatthew Wild <mwild1@gmail.com>2012-02-11 14:51:29 +0000
commitcad7f6fa09893392c807a270d255a58eeed99bb3 (patch)
tree98d3b83f44f5f7dad47e35619b81fa374558a477 /util
parent5958b69a5d3817e9b2e0828c336454220473c228 (diff)
parentc256444e8b4181648a938c24270feaade73d9b5a (diff)
downloadprosody-cad7f6fa09893392c807a270d255a58eeed99bb3.tar.gz
prosody-cad7f6fa09893392c807a270d255a58eeed99bb3.zip
Merge with 0.9
Diffstat (limited to 'util')
-rw-r--r--util/prosodyctl.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 128eec2c..439de551 100644
--- 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