aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-03-08 03:38:22 +0000
committerMatthew Wild <mwild1@gmail.com>2009-03-08 03:38:22 +0000
commitd2ebe25dc579fb0ab21e411518c50eee1fae0f99 (patch)
treedbd3f1adee49adfd2d9865f99e4a3c2b356aa5dc /plugins
parent61ca31c484a4ad127d9088aaf14914c3af37a26a (diff)
parent90fa7296e47fa3439f9842b6904c35dba48364e7 (diff)
downloadprosody-d2ebe25dc579fb0ab21e411518c50eee1fae0f99.tar.gz
prosody-d2ebe25dc579fb0ab21e411518c50eee1fae0f99.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_saslauth.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index ed19a150..4804607b 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -17,6 +17,7 @@ local t_concat, t_insert = table.concat, table.insert;
local tostring = tostring;
local jid_split = require "util.jid".split
local md5 = require "util.hashes".md5;
+local config = require "core.configmanager";
local log = require "util.logger".init("mod_saslauth");
@@ -106,7 +107,9 @@ module:add_event_hook("stream-features",
-- TODO: Provide PLAIN only if TLS is active, this is a SHOULD from the introduction of RFC 4616. This behavior could be overridden via configuration but will issuing a warning or so.
features:tag("mechanism"):text("PLAIN"):up();
features:tag("mechanism"):text("DIGEST-MD5"):up();
- features:tag("mechanism"):text("ANONYMOUS"):up();
+ if config.get(session.host or "*", "core", "sasl_anonymous") then
+ features:tag("mechanism"):text("ANONYMOUS"):up();
+ end
features:up();
else
features:tag("bind", bind_attr):tag("required"):up():up();