# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1328971889 0
# Node ID 6dc327809dfda46d9f90aeb20aa7161d82239df5
# Parent  bfa387f268e2497c192426e8490e9867aa1b7434# Parent  dd1eaecc11f95abf29ae18d70211c80932d38cee
Merge with 0.9

diff -r bfa387f268e2 -r 6dc327809dfd core/hostmanager.lua
--- 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");
diff -r bfa387f268e2 -r 6dc327809dfd util/prosodyctl.lua
--- 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