Software / code / prosody
Changeset
4494:694491140a67
Merge with 0.9
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 26 Jan 2012 18:48:21 +0000 |
| parents | 4488:99b37efe13ed (current diff) 4493:cad62a675b60 (diff) |
| children | 4495:c0f5c78cb817 |
| files | core/s2smanager.lua |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/core/s2smanager.lua Thu Jan 26 18:47:59 2012 +0000 +++ b/core/s2smanager.lua Thu Jan 26 18:48:21 2012 +0000 @@ -659,7 +659,7 @@ else return false; end - session.log("debug", "connection %s->%s is now authenticated", session.from_host or "(unknown)", session.to_host or "(unknown)"); + session.log("debug", "connection %s->%s is now authenticated for %s", session.from_host or "(unknown)", session.to_host or "(unknown)", host); mark_connected(session);
--- a/plugins/mod_saslauth.lua Thu Jan 26 18:47:59 2012 +0000 +++ b/plugins/mod_saslauth.lua Thu Jan 26 18:48:21 2012 +0000 @@ -191,8 +191,10 @@ 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
