diff options
| author | Tobias Markmann <tm@ayena.de> | 2009-11-30 23:25:10 +0100 |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2009-11-30 23:25:10 +0100 |
| commit | 37ace9243be47afe89013bc44912af491f9b1d9b (patch) | |
| tree | 052db778333769cbf84a469d86c3933212573213 | |
| parent | 4d1368b58f7aafa6593bcff2d9684441e09fbc4d (diff) | |
| parent | 2100104326791787aafc14012c731e54ed4c35fa (diff) | |
| download | prosody-37ace9243be47afe89013bc44912af491f9b1d9b.tar.gz prosody-37ace9243be47afe89013bc44912af491f9b1d9b.zip | |
Merge with tip.
| -rw-r--r-- | util/sasl/scram.lua | 4 | ||||
| -rw-r--r-- | util/stanza.lua | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua index 1e9c6f7d..be82c60e 100644 --- a/util/sasl/scram.lua +++ b/util/sasl/scram.lua @@ -70,8 +70,8 @@ local function validate_username(username) 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 --git a/util/stanza.lua b/util/stanza.lua index d295d5cc..8d3b7747 100644 --- a/util/stanza.lua +++ b/util/stanza.lua @@ -93,6 +93,17 @@ function stanza_mt:add_child(child) 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 |