Merge 0.6->0.7

[prosody.git] / plugins / mod_auth_internal_plain.lua

diff --git a/plugins/mod_auth_internal_plain.lua b/plugins/mod_auth_internal_plain.lua
index 4cf0edb69d056dfcf47bcdb4fe31cbcd84e2c916..784553ea6d4ca499725b1da8d4677dd039fcb9a1 100644 (file)
--- a/plugins/mod_auth_internal_plain.lua
+++ b/plugins/mod_auth_internal_plain.lua
@@ -62,11 +62,14 @@ function new_default_provider(host)
        function provider.create_user(username, password)
                return datamanager.store(username, host, "accounts", {password = password});
        end
+       
+       function provider.delete_user(username)
+               return datamanager.store(username, host, "accounts", nil);
+       end
 
        function provider.get_sasl_handler()
-               local realm = module:get_option("sasl_realm") or module.host;
                local getpass_authentication_profile = {
-                       plain = function(username, realm)
+                       plain = function(sasl, username, realm)
                                local prepped_username = nodeprep(username);
                                if not prepped_username then
                                        log("debug", "NODEprep failed on username: %s", username);
@@ -79,7 +82,7 @@ function new_default_provider(host)
                                return password, true;
                        end
                };
-               return new_sasl(realm, getpass_authentication_profile);
+               return new_sasl(module.host, getpass_authentication_profile);
        end
        
        return provider;