diff plugins/mod_saslauth.lua @ 2896:49db4238ecfd

Merge darkrain->trunk
author Matthew Wild <mwild1@gmail.com>
date Thu, 18 Mar 2010 01:31:37 +0000
parents 066c199135d5
children 692b3c6c5bd2
line wrap: on
line diff
--- a/plugins/mod_saslauth.lua	Thu Mar 18 01:27:31 2010 +0000
+++ b/plugins/mod_saslauth.lua	Thu Mar 18 01:31:37 2010 +0000
@@ -161,10 +161,11 @@
 		if secure_auth_only and not origin.secure then
 			return;
 		end
+		local realm = module:get_option("sasl_realm") or origin.host;
 		if module:get_option("anonymous_login") then
-			origin.sasl_handler = new_sasl(origin.host, anonymous_authentication_profile);
+			origin.sasl_handler = new_sasl(realm, anonymous_authentication_profile);
 		else
-			origin.sasl_handler = new_sasl(origin.host, default_authentication_profile);
+			origin.sasl_handler = new_sasl(realm, default_authentication_profile);
 			if not (module:get_option("allow_unencrypted_plain_auth")) and not origin.secure then
 				origin.sasl_handler:forbidden({"PLAIN"});
 			end