From e7c19c5cb643dd6160e181cc8ff767a604c640b8 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Wed, 12 Sep 2012 21:32:12 +0500 Subject: mod_auth_{internal_plain,cyrus,anonymous}: Get rid of useless wrapper function new_default_provider. --- plugins/mod_auth_anonymous.lua | 54 ++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 28 deletions(-) (limited to 'plugins/mod_auth_anonymous.lua') diff --git a/plugins/mod_auth_anonymous.lua b/plugins/mod_auth_anonymous.lua index c080177d..761dc8a4 100644 --- a/plugins/mod_auth_anonymous.lua +++ b/plugins/mod_auth_anonymous.lua @@ -9,41 +9,39 @@ local new_sasl = require "util.sasl".new; local datamanager = require "util.datamanager"; -function new_default_provider(host) - local provider = { name = "anonymous" }; +-- define auth provider +local provider = { name = "anonymous" }; - function provider.test_password(username, password) - return nil, "Password based auth not supported."; - end - - function provider.get_password(username) - return nil, "Password not available."; - end +function provider.test_password(username, password) + return nil, "Password based auth not supported."; +end - function provider.set_password(username, password) - return nil, "Password based auth not supported."; - end +function provider.get_password(username) + return nil, "Password not available."; +end - function provider.user_exists(username) - return nil, "Only anonymous users are supported."; -- FIXME check if anonymous user is connected? - end +function provider.set_password(username, password) + return nil, "Password based auth not supported."; +end - function provider.create_user(username, password) - return nil, "Account creation/modification not supported."; - end +function provider.user_exists(username) + return nil, "Only anonymous users are supported."; -- FIXME check if anonymous user is connected? +end - function provider.get_sasl_handler() - local anonymous_authentication_profile = { - anonymous = function(sasl, username, realm) - return true; -- for normal usage you should always return true here - end - }; - return new_sasl(module.host, anonymous_authentication_profile); - end +function provider.create_user(username, password) + return nil, "Account creation/modification not supported."; +end - return provider; +function provider.get_sasl_handler() + local anonymous_authentication_profile = { + anonymous = function(sasl, username, realm) + return true; -- for normal usage you should always return true here + end + }; + return new_sasl(module.host, anonymous_authentication_profile); end +-- datamanager callback to disable writes local function dm_callback(username, host, datastore, data) if host == module.host then return false; @@ -64,5 +62,5 @@ function module.unload() datamanager.remove_callback(dm_callback); end -module:add_item("auth-provider", new_default_provider(module.host)); +module:add_item("auth-provider", provider); -- cgit v1.2.3 From 92515e7aa6dbcc3a9a8e3d8de5f368c69df59842 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Wed, 12 Sep 2012 21:41:51 +0500 Subject: mod_auth_*: Use module:provides(). --- plugins/mod_auth_anonymous.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/mod_auth_anonymous.lua') diff --git a/plugins/mod_auth_anonymous.lua b/plugins/mod_auth_anonymous.lua index 761dc8a4..c27057be 100644 --- a/plugins/mod_auth_anonymous.lua +++ b/plugins/mod_auth_anonymous.lua @@ -10,7 +10,7 @@ local new_sasl = require "util.sasl".new; local datamanager = require "util.datamanager"; -- define auth provider -local provider = { name = "anonymous" }; +local provider = {}; function provider.test_password(username, password) return nil, "Password based auth not supported."; @@ -62,5 +62,5 @@ function module.unload() datamanager.remove_callback(dm_callback); end -module:add_item("auth-provider", provider); +module:provides("auth", provider); -- cgit v1.2.3