aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2010-12-27 19:57:04 +0500
committerWaqas Hussain <waqas20@gmail.com>2010-12-27 19:57:04 +0500
commit1865c2454bf4037fdc992485451de1fc5214c508 (patch)
tree61b9f26137fe3dadaf8d3d422355c7e0c8c9f2bd /plugins
parentc1d6450cec9153c4b6c3d46ed1127a4eee092c50 (diff)
downloadprosody-1865c2454bf4037fdc992485451de1fc5214c508.tar.gz
prosody-1865c2454bf4037fdc992485451de1fc5214c508.zip
util.sasl.*, mod_auth_*, mod_saslauth: Pass SASL handler as first parameter to SASL profile callbacks.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_auth_anonymous.lua2
-rw-r--r--plugins/mod_auth_internal_hashed.lua4
-rw-r--r--plugins/mod_auth_internal_plain.lua2
-rw-r--r--plugins/mod_saslauth.lua2
4 files changed, 5 insertions, 5 deletions
diff --git a/plugins/mod_auth_anonymous.lua b/plugins/mod_auth_anonymous.lua
index 0741a158..9d0896e5 100644
--- a/plugins/mod_auth_anonymous.lua
+++ b/plugins/mod_auth_anonymous.lua
@@ -36,7 +36,7 @@ function new_default_provider(host)
function provider.get_sasl_handler()
local realm = module:get_option("sasl_realm") or module.host;
local anonymous_authentication_profile = {
- anonymous = function(username, realm)
+ anonymous = function(sasl, username, realm)
return true; -- for normal usage you should always return true here
end
};
diff --git a/plugins/mod_auth_internal_hashed.lua b/plugins/mod_auth_internal_hashed.lua
index 300bebf8..ec8da9ab 100644
--- a/plugins/mod_auth_internal_hashed.lua
+++ b/plugins/mod_auth_internal_hashed.lua
@@ -138,7 +138,7 @@ function new_hashpass_provider(host)
function provider.get_sasl_handler()
local realm = module:get_option("sasl_realm") or module.host;
local testpass_authentication_profile = {
- plain_test = function(username, password, realm)
+ plain_test = function(sasl, username, password, realm)
local prepped_username = nodeprep(username);
if not prepped_username then
log("debug", "NODEprep failed on username: %s", username);
@@ -146,7 +146,7 @@ function new_hashpass_provider(host)
end
return usermanager.test_password(prepped_username, realm, password), true;
end,
- scram_sha_1 = function(username, realm)
+ scram_sha_1 = function(sasl, username, realm)
local credentials = datamanager.load(username, host, "accounts");
if not credentials then return; end
if credentials.password then
diff --git a/plugins/mod_auth_internal_plain.lua b/plugins/mod_auth_internal_plain.lua
index 4cf0edb6..3721781b 100644
--- a/plugins/mod_auth_internal_plain.lua
+++ b/plugins/mod_auth_internal_plain.lua
@@ -66,7 +66,7 @@ function new_default_provider(host)
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);
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index e1746c8e..65053ffa 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -31,7 +31,7 @@ local xmlns_stanzas ='urn:ietf:params:xml:ns:xmpp-stanzas';
local new_sasl = require "util.sasl".new;
local anonymous_authentication_profile = {
- anonymous = function(username, realm)
+ anonymous = function(sasl, username, realm)
return true; -- for normal usage you should always return true here
end
};