# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1254250583 -3600
# Node ID 1842da566c7d6dd16f1cc824d6d56c65a90efc1b
# Parent  e52dbae3c05d8204afda08b23b4f55241db91a82# Parent  fdb43fc1bafc16ed7d2054bcccffded94bf4055e
Merge with 0.5

diff -r e52dbae3c05d -r 1842da566c7d plugins/mod_saslauth.lua
--- a/plugins/mod_saslauth.lua	Tue Sep 29 19:07:17 2009 +0100
+++ b/plugins/mod_saslauth.lua	Tue Sep 29 19:56:23 2009 +0100
@@ -56,14 +56,15 @@
 	if status == "failure" then
 		session.sasl_handler = nil;
 	elseif status == "success" then
-		if not session.sasl_handler.username then -- TODO move this to sessionmanager
+		local username = nodeprep(session.sasl_handler.username);
+		session.sasl_handler = nil;
+		if not username then -- TODO move this to sessionmanager
 			module:log("warn", "SASL succeeded but we didn't get a username!");
 			session.sasl_handler = nil;
 			session:reset_stream();
 			return;
-		end
-		sm_make_authenticated(session, session.sasl_handler.username);
-		session.sasl_handler = nil;
+		end 
+		sm_make_authenticated(session, username);
 		session:reset_stream();
 	end
 end