# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1327603701 0
# Node ID 694491140a67de7fd6c79ed18cbcb19145a5b7cc
# Parent  99b37efe13ed985b4a2d36b690f84f9113e9f91c# Parent  cad62a675b60955c7e818a90d2374f03e387bb5d
Merge with 0.9

diff -r 99b37efe13ed -r 694491140a67 core/s2smanager.lua
--- 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);
 	
diff -r 99b37efe13ed -r 694491140a67 plugins/mod_saslauth.lua
--- 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