aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-18 01:31:37 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-18 01:31:37 +0000
commit67e1ec2f26912f934b7c6900d4d9669b33de1a36 (patch)
tree5995fd34e5532c2ef8566083cdc72ce7e4d84305 /plugins
parent0d6100844b07daef86571021aa8d3492e4da45ee (diff)
parent11b625e4ebc9bc396bb7fbf84fb058dc1e271897 (diff)
downloadprosody-67e1ec2f26912f934b7c6900d4d9669b33de1a36.tar.gz
prosody-67e1ec2f26912f934b7c6900d4d9669b33de1a36.zip
Merge darkrain->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_saslauth.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 0cae5833..1143549a 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -161,10 +161,11 @@ module:hook("stream-features", function(event)
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