Software / code / prosody
Changeset
4945:06635b834e76
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Sat, 07 Jul 2012 02:43:57 +0100 |
| parents | 4942:716db7d94481 (current diff) 4944:72a2eec4204a (diff) |
| children | 4949:521976cb56e6 |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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 };
