Changeset

342:8e9e5c7d97ff

mod_auth_*: Get rid of undocumented and broken 'sasl_realm' config option.
author Waqas Hussain <waqas20@gmail.com>
date Wed, 23 Feb 2011 01:36:46 +0500
parents 341:f801ce6826d5
children 343:845a59c99b4d
files mod_auth_dovecot/mod_auth_dovecot.lua mod_auth_external/mod_auth_external.lua mod_auth_ldap/mod_auth_ldap.lua
diffstat 3 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mod_auth_dovecot/mod_auth_dovecot.lua	Wed Feb 16 22:04:55 2011 +0000
+++ b/mod_auth_dovecot/mod_auth_dovecot.lua	Wed Feb 23 01:36:46 2011 +0500
@@ -208,7 +208,6 @@
 	end
 
 	function provider.get_sasl_handler()
-		local realm = module:get_option("sasl_realm") or module.host;
 		local getpass_authentication_profile = {
 			plain_test = function(sasl, username, password, realm)
 			local prepped_username = nodeprep(username);
@@ -219,7 +218,7 @@
 			return usermanager.test_password(prepped_username, realm, password), true;
 		end
 		};
-		return new_sasl(realm, getpass_authentication_profile);
+		return new_sasl(module.host, getpass_authentication_profile);
 	end
 	
 	return provider;
--- a/mod_auth_external/mod_auth_external.lua	Wed Feb 16 22:04:55 2011 +0000
+++ b/mod_auth_external/mod_auth_external.lua	Wed Feb 23 01:36:46 2011 +0500
@@ -111,7 +111,6 @@
 	function provider.create_user(username, password) return nil, "Account creation/modification not available."; end
 	
 	function provider.get_sasl_handler()
-		local realm = module:get_option("sasl_realm") or module.host;
 		local testpass_authentication_profile = {
 			plain_test = function(sasl, username, password, realm)
 				local prepped_username = nodeprep(username);
@@ -122,7 +121,7 @@
 				return usermanager.test_password(prepped_username, realm, password), true;
 			end,
 		};
-		return new_sasl(realm, testpass_authentication_profile);
+		return new_sasl(module.host, testpass_authentication_profile);
 	end
 
 	function provider.is_admin(jid)
--- a/mod_auth_ldap/mod_auth_ldap.lua	Wed Feb 16 22:04:55 2011 +0000
+++ b/mod_auth_ldap/mod_auth_ldap.lua	Wed Feb 23 01:36:46 2011 +0500
@@ -40,7 +40,6 @@
 function provider.create_user(username, password) return nil, "Account creation/modification not available with LDAP."; end
 
 function provider.get_sasl_handler()
-	local realm = module:get_option("sasl_realm") or module.host;
 	local testpass_authentication_profile = {
 		plain_test = function(sasl, username, password, realm)
 			local prepped_username = nodeprep(username);
@@ -51,7 +50,7 @@
 			return provider.test_password(prepped_username, password), true;
 		end
 	};
-	return new_sasl(realm, testpass_authentication_profile);
+	return new_sasl(module.host, testpass_authentication_profile);
 end
 
 module:add_item("auth-provider", provider);