aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/mod_auth_internal_hashed.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-08-28 21:05:12 +0200
committerKim Alvefur <zash@zash.se>2017-08-28 21:05:12 +0200
commit0f00e8546042a22a56ea63a0fb7387e70bba4d1a (patch)
treefd5a447ceea625acd90410b509ca06e498d25171 /plugins/mod_auth_internal_hashed.lua
parentab793182e77752bd08cf0347a95298312693563b (diff)
parent672ab9595bcadcefa5c8725fd0ba4d7d6089b4f5 (diff)
downloadprosody-0f00e8546042a22a56ea63a0fb7387e70bba4d1a.tar.gz
prosody-0f00e8546042a22a56ea63a0fb7387e70bba4d1a.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/mod_auth_internal_hashed.lua')
-rw-r--r--plugins/mod_auth_internal_hashed.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_auth_internal_hashed.lua b/plugins/mod_auth_internal_hashed.lua
index 53e345e5..35764afb 100644
--- a/plugins/mod_auth_internal_hashed.lua
+++ b/plugins/mod_auth_internal_hashed.lua
@@ -120,7 +120,9 @@ function provider.get_sasl_handler()
local credentials = accounts:get(username);
if not credentials then return; end
if credentials.password then
- usermanager.set_password(username, credentials.password, host);
+ if provider.set_password(username, credentials.password) == nil then
+ return nil, "Auth failed. Could not set hashed password from plaintext.";
+ end
credentials = accounts:get(username);
if not credentials then return; end
end