--- a/util/sasl.lua	Fri Nov 28 19:24:08 2008 +0100
+++ b/util/sasl.lua	Sat Nov 29 11:24:59 2008 +0100
@@ -67,7 +67,7 @@
 	
 	local function parse(data)
 		message = {}
-		for k, v in gmatch(data, [[([%w%-]+)="?([%w%-%/%.%+=]+)"?,?]]) do
+		for k, v in gmatch(data, [[([%w%-]+)="?([^",]*)"?,?]]) do -- FIXME The hacky regex makes me shudder
 			message[k] = v
 		end
 		return message