aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2012-01-26 18:48:21 +0000
committerMatthew Wild <mwild1@gmail.com>2012-01-26 18:48:21 +0000
commit85a4ddb16de85a50dd226a45c2fca885fc95b665 (patch)
tree977aaba7354c482266ebde89a7d44312e77aa4b2 /plugins
parent7437e279cbe895b88dbf7902f86cc0a9803cd04a (diff)
parent52e7f9dcbd32b32b774523d365d4ca5e3ef50b0d (diff)
downloadprosody-85a4ddb16de85a50dd226a45c2fca885fc95b665.tar.gz
prosody-85a4ddb16de85a50dd226a45c2fca885fc95b665.zip
Merge with 0.9
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_saslauth.lua6
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 9c62e5ec..58655a24 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -191,8 +191,10 @@ local function s2s_external_auth(session, stanza)
session.from_host = text;
end
session.sends2s(build_reply("success"))
- module:log("info", "Accepting SASL EXTERNAL identity from %s", text or session.from_host);
- s2s_make_authenticated(session, text or session.from_host)
+
+ local domain = text ~= "" and text or session.from_host;
+ module:log("info", "Accepting SASL EXTERNAL identity from %s", domain);
+ s2s_make_authenticated(session, domain);
session:reset_stream();
return true
end