From 6448e03b74dbc86ba12870e4166a139a475196b0 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sat, 11 Feb 2012 14:49:51 +0000 Subject: util.prosodyctl: Fix variable name clash introduced in 55ef5d83d00a (thanks chris) --- util/prosodyctl.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua index 6e9eed4e..2da39cb2 100644 --- a/util/prosodyctl.lua +++ b/util/prosodyctl.lua @@ -121,11 +121,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 -- cgit v1.2.3 From fa30c62a6abcead910e0ea85529a0225d7a16e41 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Sat, 11 Feb 2012 14:51:00 +0000 Subject: hostmanager: Import jid_split (thanks chris) --- core/hostmanager.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/core/hostmanager.lua b/core/hostmanager.lua index 0dd1d426..7edf8230 100644 --- a/core/hostmanager.lua +++ b/core/hostmanager.lua @@ -12,6 +12,7 @@ local events_new = require "util.events".new; 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"); -- cgit v1.2.3