aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-03-02 15:21:07 +0100
committerKim Alvefur <zash@zash.se>2017-03-02 15:21:07 +0100
commit962ba796132d9dd59f7db308bbb0f633caf6bc0b (patch)
treec79d41ebf1b4a95c083a91e7f514089bc49d3823
parentfd19cd42b0d97ead99d7af196d98d2ffdd51dcec (diff)
parentd471c7b124575cb2657c0e80711e8803f797b25f (diff)
downloadprosody-962ba796132d9dd59f7db308bbb0f633caf6bc0b.tar.gz
prosody-962ba796132d9dd59f7db308bbb0f633caf6bc0b.zip
Merge 0.9->0.10
-rw-r--r--plugins/mod_saslauth.lua15
1 files changed, 13 insertions, 2 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 68c4fe64..ee468c17 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -96,8 +96,19 @@ end)
module:hook_stanza(xmlns_sasl, "failure", function (session, stanza)
if session.type ~= "s2sout_unauthed" or session.external_auth ~= "attempting" then return; end
- module:log("info", "SASL EXTERNAL with %s failed", session.to_host)
- -- TODO: Log the failure reason
+ local text = stanza:get_child_text("text");
+ local condition = "unknown-condition";
+ for child in stanza:childtags() do
+ if child.name ~= "text" then
+ condition = child.name;
+ break;
+ end
+ end
+ if text and condition then
+ condition = connection .. ": " .. text;
+ end
+ module:log("info", "SASL EXTERNAL with %s failed: %s", session.to_host, condition);
+
session.external_auth = "failed"
session:close();
return true;