From 9c85f1fccd8d28f20f3a1dbe341f505436fac7dd Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Wed, 23 Feb 2011 01:34:46 +0500
Subject: mod_auth_*: Get rid of undocumented and broken 'sasl_realm' config
 option.

---
 plugins/mod_auth_anonymous.lua       | 3 +--
 plugins/mod_auth_cyrus.lua           | 6 ++----
 plugins/mod_auth_internal_hashed.lua | 3 +--
 plugins/mod_auth_internal_plain.lua  | 3 +--
 4 files changed, 5 insertions(+), 10 deletions(-)

(limited to 'plugins')

diff --git a/plugins/mod_auth_anonymous.lua b/plugins/mod_auth_anonymous.lua
index 9d0896e5..8d790508 100644
--- a/plugins/mod_auth_anonymous.lua
+++ b/plugins/mod_auth_anonymous.lua
@@ -34,13 +34,12 @@ function new_default_provider(host)
 	end
 
 	function provider.get_sasl_handler()
-		local realm = module:get_option("sasl_realm") or module.host;
 		local anonymous_authentication_profile = {
 			anonymous = function(sasl, username, realm)
 				return true; -- for normal usage you should always return true here
 			end
 		};
-		return new_sasl(realm, anonymous_authentication_profile);
+		return new_sasl(module.host, anonymous_authentication_profile);
 	end
 
 	return provider;
diff --git a/plugins/mod_auth_cyrus.lua b/plugins/mod_auth_cyrus.lua
index 2a52c8b5..447fae51 100644
--- a/plugins/mod_auth_cyrus.lua
+++ b/plugins/mod_auth_cyrus.lua
@@ -28,9 +28,8 @@ local new_sasl = function(realm)
 end
 
 do -- diagnostic
-	local realm = module:get_option("sasl_realm") or module.host;
 	local list;
-	for mechanism in pairs(new_sasl(realm):mechanisms()) do
+	for mechanism in pairs(new_sasl(module.host):mechanisms()) do
 		list = (not(list) and mechanism) or (list..", "..mechanism);
 	end
 	if not list then
@@ -68,8 +67,7 @@ function new_default_provider(host)
 	end
 
 	function provider.get_sasl_handler()
-		local realm = module:get_option("sasl_realm") or module.host;
-		local handler = new_sasl(realm);
+		local handler = new_sasl(module.host);
 		if require_provisioning then
 			function handler.require_provisioning(username)
 				return usermanager_user_exists(username, module.host);
diff --git a/plugins/mod_auth_internal_hashed.lua b/plugins/mod_auth_internal_hashed.lua
index 3ce8c076..ee810426 100644
--- a/plugins/mod_auth_internal_hashed.lua
+++ b/plugins/mod_auth_internal_hashed.lua
@@ -140,7 +140,6 @@ function new_hashpass_provider(host)
 	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);
@@ -175,7 +174,7 @@ function new_hashpass_provider(host)
 				return stored_key, server_key, iteration_count, salt, true;
 			end
 		};
-		return new_sasl(realm, testpass_authentication_profile);
+		return new_sasl(module.host, testpass_authentication_profile);
 	end
 	
 	return provider;
diff --git a/plugins/mod_auth_internal_plain.lua b/plugins/mod_auth_internal_plain.lua
index ccaf8381..784553ea 100644
--- a/plugins/mod_auth_internal_plain.lua
+++ b/plugins/mod_auth_internal_plain.lua
@@ -68,7 +68,6 @@ function new_default_provider(host)
 	end
 
 	function provider.get_sasl_handler()
-		local realm = module:get_option("sasl_realm") or module.host;
 		local getpass_authentication_profile = {
 			plain = function(sasl, username, realm)
 				local prepped_username = nodeprep(username);
@@ -83,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;
-- 
cgit v1.2.3