aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-02-28 20:05:56 +0100
committerKim Alvefur <zash@zash.se>2016-02-28 20:05:56 +0100
commit8e521f441ea38df4156e4945c564c11fefbffd17 (patch)
tree8212a106f78e4d988ee48d938496162cf17d890a
parentffc455a307546e590923e3df6848bec2bc8fce17 (diff)
parent47450a0eff25547333f561ff2903f92d081c9bdf (diff)
downloadprosody-8e521f441ea38df4156e4945c564c11fefbffd17.tar.gz
prosody-8e521f441ea38df4156e4945c564c11fefbffd17.zip
Merge 0.10->trunk
-rw-r--r--util/sasl/scram.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua
index febbc639..d2b2abde 100644
--- a/util/sasl/scram.lua
+++ b/util/sasl/scram.lua
@@ -172,8 +172,8 @@ local function scram_gen(hash_name, H_f, HMAC_f)
elseif self.profile[profile_name] then
local status;
stored_key, server_key, iteration_count, salt, status = self.profile[profile_name](self, username, self.realm);
- if state == nil then return "failure", "not-authorized"
- elseif state == false then return "failure", "account-disabled" end
+ if status == nil then return "failure", "not-authorized"
+ elseif status == false then return "failure", "account-disabled" end
end
local nonce = clientnonce .. generate_uuid();