Mercurial > lxmppd-hg-xmllex / changeset
changeset
Merge 0.7->trunk
Mon, 24 May 2010 19:46:12 +0100
- author
- Matthew Wild <mwild1@gmail.com>
- date
- Mon, 24 May 2010 19:46:12 +0100
- changeset 3124
- 21e60658767d
- parent 3121
- 27f895bac9c0 (current diff)
- parent 3123
- 0f21abc745ef (diff)
- child 3126
- 9095eb464260
Merge 0.7->trunk
| util/sasl/digest-md5.lua | file | annotate | diff | comparison | revisions | |
| util/sasl/scram.lua | file | annotate | diff | comparison | revisions |
--- a/util/sasl/scram.lua Mon May 24 19:39:07 2010 +0100 +++ b/util/sasl/scram.lua Mon May 24 19:46:12 2010 +0100 @@ -164,7 +164,7 @@ return "failure", "temporary-auth-failure"; end elseif self.profile["scram_"..hashprep(hash_name)] then - local salted_password, iteration_count, salt, state = self.profile["scram-"..hash_name](self.state.name, self.realm); + local salted_password, iteration_count, salt, state = self.profile["scram_"..hashprep(hash_name)](self.state.name, self.realm); if state == nil then return "failure", "not-authorized" elseif state == false then return "failure", "account-disabled" end
