Software / code / prosody
Changeset
4503:6dc327809dfd
Merge with 0.9
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 11 Feb 2012 14:51:29 +0000 |
| parents | 4500:bfa387f268e2 (current diff) 4502:dd1eaecc11f9 (diff) |
| children | 4507:32177c680d2a |
| files | util/prosodyctl.lua |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/core/hostmanager.lua Wed Feb 08 16:20:07 2012 +0100 +++ b/core/hostmanager.lua Sat Feb 11 14:51:29 2012 +0000 @@ -12,6 +12,7 @@ local disco_items = require "util.multitable".new(); local NULL = {}; +local jid_split = require "util.jid".split; local uuid_gen = require "util.uuid".generate; local log = require "util.logger".init("hostmanager");
--- a/util/prosodyctl.lua Wed Feb 08 16:20:07 2012 +0100 +++ b/util/prosodyctl.lua Sat Feb 11 14:51:29 2012 +0000 @@ -136,11 +136,11 @@ 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
