diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-07-07 02:43:57 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-07-07 02:43:57 +0100 |
| commit | f305f2082762ad627aaf018132d81382a5206cbd (patch) | |
| tree | 1d1c716a40bc81e050185e108df23b86bc6cb393 | |
| parent | 4942d8f996e41f2fdb628ceb660d80f00637c111 (diff) | |
| parent | 7180665b081fef6f162e5b06564ebf515d2515f7 (diff) | |
| download | prosody-f305f2082762ad627aaf018132d81382a5206cbd.tar.gz prosody-f305f2082762ad627aaf018132d81382a5206cbd.zip | |
Merge 0.9->trunk
| -rw-r--r-- | core/usermanager.lua | 4 | ||||
| -rw-r--r-- | plugins/mod_auth_anonymous.lua | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/usermanager.lua b/core/usermanager.lua index 50aee701..3aba5786 100644 --- a/core/usermanager.lua +++ b/core/usermanager.lua @@ -91,8 +91,8 @@ function delete_user(username, host) 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 --git a/plugins/mod_auth_anonymous.lua b/plugins/mod_auth_anonymous.lua index c080177d..3cb7cf98 100644 --- a/plugins/mod_auth_anonymous.lua +++ b/plugins/mod_auth_anonymous.lua @@ -32,9 +32,10 @@ function new_default_provider(host) 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 }; |