diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-01-26 18:48:21 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-01-26 18:48:21 +0000 |
| commit | 3c8c0f2e94c21f8d330120ec43e51acce73c88ba (patch) | |
| tree | 977aaba7354c482266ebde89a7d44312e77aa4b2 | |
| parent | 71cbdc86adfa7c32cb7407c8ad822b25fc9a173f (diff) | |
| parent | fdd51ac3ffa99de906d63f9b45897c0c95ce8e2a (diff) | |
| download | prosody-3c8c0f2e94c21f8d330120ec43e51acce73c88ba.tar.gz prosody-3c8c0f2e94c21f8d330120ec43e51acce73c88ba.zip | |
Merge with 0.9
| -rw-r--r-- | core/s2smanager.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_saslauth.lua | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index f44921c3..822713fe 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -659,7 +659,7 @@ function make_authenticated(session, host) 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); 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 |