# HG changeset patch
# User Waqas Hussain <waqas20@gmail.com>
# Date 1276101272 -18000
# Node ID a69d8021b1dbb1aeea5aa2a5c353aa1bef39ddd6
# Parent  7a15cbf23c5b92bdf15571db1790b8fbb72844bf# Parent  c85bba8bd41ae23a44430e42486479c43bdda8f8
Merge with Tobias.

diff -r c85bba8bd41a -r a69d8021b1db plugins/mod_announce.lua
--- a/plugins/mod_announce.lua	Wed Jun 09 17:58:20 2010 +0200
+++ b/plugins/mod_announce.lua	Wed Jun 09 21:34:32 2010 +0500
@@ -22,7 +22,6 @@
 	if not is_admin(stanza.attr.from) then
 		-- Not an admin? Not allowed!
 		module:log("warn", "Non-admin %s tried to send server announcement", tostring(jid.bare(stanza.attr.from)));
-		origin.send(st.error_reply(stanza, "cancel", "service-unavailable"));
 		return;
 	end
 	
diff -r c85bba8bd41a -r a69d8021b1db plugins/mod_auth_internal_hashed.lua
--- a/plugins/mod_auth_internal_hashed.lua	Wed Jun 09 17:58:20 2010 +0200
+++ b/plugins/mod_auth_internal_hashed.lua	Wed Jun 09 21:34:32 2010 +0500
@@ -138,7 +138,7 @@
 			scram_sha_1 = function(username, realm)
 				local credentials = datamanager.load(username, host, "accounts") or {};
 				if credentials.password then
-					usermanager.set_password(username, credentials.password);
+					usermanager.set_password(username, credentials.password, host);
 					credentials = datamanager.load(username, host, "accounts") or {};
 				end
 				
diff -r c85bba8bd41a -r a69d8021b1db plugins/mod_compression.lua
--- a/plugins/mod_compression.lua	Wed Jun 09 17:58:20 2010 +0200
+++ b/plugins/mod_compression.lua	Wed Jun 09 21:34:32 2010 +0500
@@ -96,7 +96,6 @@
 -- setup compression for a stream
 local function setup_compression(session, deflate_stream)
 	add_filter(session, "bytes/out", function(t)
-		session.log(t)
 		local status, compressed, eof = pcall(deflate_stream, tostring(t), 'sync');
 		if status == false then
 			session:close({
diff -r c85bba8bd41a -r a69d8021b1db tools/xep227toprosody.lua