# HG changeset patch
# User Tobias Markmann <tm@ayena.de>
# Date 1259619910 -3600
# Node ID efea91c740a27931b14f127c25e58fdb73603b83
# Parent  e0b2d934f31695ce852dbcd15ddfbc3246630cc1# Parent  7fe644057dc26ac358dda8fc03961e777751e4ff
Merge with tip.

diff -r e0b2d934f316 -r efea91c740a2 util/sasl/scram.lua
--- a/util/sasl/scram.lua	Mon Nov 30 23:23:42 2009 +0100
+++ b/util/sasl/scram.lua	Mon Nov 30 23:25:10 2009 +0100
@@ -70,8 +70,8 @@
 	end
 	
 	-- replace =2D with , and =3D with =
-	username:gsub("=2D", ",");
-	username:gsub("=3D", "=");
+	username = username:gsub("=2D", ",");
+	username = username:gsub("=3D", "=");
 	
 	-- apply SASLprep
 	username = saslprep(username);
diff -r e0b2d934f316 -r efea91c740a2 util/stanza.lua
--- a/util/stanza.lua	Mon Nov 30 23:23:42 2009 +0100
+++ b/util/stanza.lua	Mon Nov 30 23:25:10 2009 +0100
@@ -93,6 +93,17 @@
 	return self;
 end
 
+function stanza_mt:get_child(name, xmlns)
+	for _, child in ipairs(self.tags) do
+		if (not name or child.name == name) 
+			and ((not xmlns and self.attr.xmlns == child.attr.xmlns)
+				or child.attr.xmlns == xmlns) then
+			
+			return child;
+		end
+	end
+end
+
 function stanza_mt:child_with_name(name)
 	for _, child in ipairs(self.tags) do	
 		if child.name == name then return child; end