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
commit6bc6d030fd128c75492a467968a0f400bc54f1ca (patch)
tree98d3b83f44f5f7dad47e35619b81fa374558a477 /util
parentaf572a612080a6fd777fe2bdcb6780f40ad2fd87 (diff)
parentfa30c62a6abcead910e0ea85529a0225d7a16e41 (diff)
downloadprosody-6bc6d030fd128c75492a467968a0f400bc54f1ca.tar.gz
prosody-6bc6d030fd128c75492a467968a0f400bc54f1ca.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