# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1328714407 -3600
# Node ID bfa387f268e2497c192426e8490e9867aa1b7434
# Parent  11983a1e92c0a12d44f9a125ff8284f905b6857a# Parent  55ef5d83d00a797afb47958446e3f16738f8b462
Merge with 0.9

diff -r 11983a1e92c0 -r bfa387f268e2 prosody.cfg.lua.dist
--- a/prosody.cfg.lua.dist	Sun Feb 05 00:10:13 2012 +0500
+++ b/prosody.cfg.lua.dist	Wed Feb 08 16:20:07 2012 +0100
@@ -45,7 +45,6 @@
 		--"compression"; -- Stream compression
 
 	-- Nice to have
-		"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
 		"version"; -- Replies to server version requests
 		"uptime"; -- Report how long server has been running
 		"time"; -- Let others know the time here on this server
@@ -67,6 +66,7 @@
 		--"welcome"; -- Welcome users who register accounts
 		--"watchregistrations"; -- Alert admins of registrations
 		--"motd"; -- Send a message to users when they log in
+		--"legacyauth"; -- Legacy authentication. Only used by some old clients and bots.
 };
 
 -- These modules are auto-loaded, should you
diff -r 11983a1e92c0 -r bfa387f268e2 util/prosodyctl.lua
--- a/util/prosodyctl.lua	Sun Feb 05 00:10:13 2012 +0500
+++ b/util/prosodyctl.lua	Wed Feb 08 16:20:07 2012 +0100
@@ -136,7 +136,11 @@
 		return false, "invalid-hostname";
 	end
 
-	local provider = prosody.hosts[host].users;
+	local host = prosody.hosts[host];
+	if not host then
+		return false, "no-such-host";
+	end
+	local provider = host.users;
 	if not(provider) or provider.name == "null" then
 		usermanager.initialize_host(host);
 	end