# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1341625437 -3600
# Node ID 06635b834e76f767ac6bdbb84213696afc28c297
# Parent  716db7d9448169d98ea33b069b00a05b45788113# Parent  72a2eec4204abe85d9bf37374fc5f3696886456a
Merge 0.9->trunk

diff -r 716db7d94481 -r 06635b834e76 core/usermanager.lua
--- a/core/usermanager.lua	Thu Jul 05 17:42:19 2012 +0100
+++ b/core/usermanager.lua	Sat Jul 07 02:43:57 2012 +0100
@@ -91,8 +91,8 @@
 	return hosts[host].users.delete_user(username);
 end
 
-function get_sasl_handler(host)
-	return hosts[host].users.get_sasl_handler();
+function get_sasl_handler(host, session)
+	return hosts[host].users.get_sasl_handler(session);
 end
 
 function get_provider(host)
diff -r 716db7d94481 -r 06635b834e76 plugins/mod_auth_anonymous.lua
--- a/plugins/mod_auth_anonymous.lua	Thu Jul 05 17:42:19 2012 +0100
+++ b/plugins/mod_auth_anonymous.lua	Sat Jul 07 02:43:57 2012 +0100
@@ -32,9 +32,10 @@
 		return nil, "Account creation/modification not supported.";
 	end
 
-	function provider.get_sasl_handler()
+	function provider.get_sasl_handler(session)
 		local anonymous_authentication_profile = {
 			anonymous = function(sasl, username, realm)
+				session.roster = {}; -- so that the null storage backend doesn't upset rostermanager
 				return true; -- for normal usage you should always return true here
 			end
 		};