From afd972f05b2ef093c395e4d0b8b01adcd3ad8e3e Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Thu, 13 Oct 2011 00:24:09 +0500 Subject: mod_saslauth: Never send empty , for real this time. --- plugins/mod_saslauth.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'plugins') diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 8a4b84d9..9c62e5ec 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -248,15 +248,13 @@ module:hook("stream-features", function(event) return; end origin.sasl_handler = usermanager_get_sasl_handler(module.host); - local mechanisms = origin.sasl_handler:mechanisms(); - if not next(mechanisms) then return; end - features:tag("mechanisms", mechanisms_attr); - for mechanism in pairs(mechanisms) do + local mechanisms = st.stanza("mechanisms", mechanisms_attr); + for mechanism in pairs(origin.sasl_handler:mechanisms()) do if mechanism ~= "PLAIN" or origin.secure or allow_unencrypted_plain_auth then - features:tag("mechanism"):text(mechanism):up(); + mechanisms:tag("mechanism"):text(mechanism):up(); end end - features:up(); + if mechanisms[1] then features:add_child(mechanisms); end else features:tag("bind", bind_attr):tag("required"):up():up(); features:tag("session", xmpp_session_attr):tag("optional"):up():up(); -- cgit v1.2.3