aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-07-24 10:56:47 +0100
committerMatthew Wild <mwild1@gmail.com>2012-07-24 10:56:47 +0100
commit9306fa497983088359c6f1f6b8c4658bf0ec2b99 (patch)
tree4c8785c3d1a2bee2caa5bbcf7e4ecdf76580b078 /plugins
parentce33d9c59d49b9b290a8c2c142861dc35779c1b1 (diff)
downloadprosody-9306fa497983088359c6f1f6b8c4658bf0ec2b99.tar.gz
prosody-9306fa497983088359c6f1f6b8c4658bf0ec2b99.zip
mod_auth_cyrus, util.sasl_cyrus: Add new option 'cyrus_server_fqdn' to override the hostname passed to Cyrus (and used in e.g. GSSAPI/Kerberos) - fixes #295
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_auth_cyrus.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/mod_auth_cyrus.lua b/plugins/mod_auth_cyrus.lua
index 447fae51..e4493f04 100644
--- a/plugins/mod_auth_cyrus.lua
+++ b/plugins/mod_auth_cyrus.lua
@@ -14,6 +14,7 @@ local cyrus_service_realm = module:get_option("cyrus_service_realm");
local cyrus_service_name = module:get_option("cyrus_service_name");
local cyrus_application_name = module:get_option("cyrus_application_name");
local require_provisioning = module:get_option("cyrus_require_provisioning") or false;
+local host_fqdn = module:get_option("cyrus_server_fqdn");
prosody.unlock_globals(); --FIXME: Figure out why this is needed and
-- why cyrussasl isn't caught by the sandbox
@@ -23,7 +24,8 @@ local new_sasl = function(realm)
return cyrus_new(
cyrus_service_realm or realm,
cyrus_service_name or "xmpp",
- cyrus_application_name or "prosody"
+ cyrus_application_name or "prosody",
+ host_fqdn
);
end