# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1274726772 -3600
# Node ID 21e60658767d06bab2f8cb64ae56e97ee9537b55
# Parent  27f895bac9c01cdc20eb2009152af8fca82c2333# Parent  0f21abc745ef46d37ab9c2d20e2e19750c30990c
Merge 0.7->trunk

diff -r 27f895bac9c0 -r 21e60658767d util/sasl/digest-md5.lua
diff -r 27f895bac9c0 -r 21e60658767d util/sasl/scram.lua
--- 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