diff options
author | Waqas Hussain <waqas20@gmail.com> | 2012-12-15 07:12:32 +0500 |
---|---|---|
committer | Waqas Hussain <waqas20@gmail.com> | 2012-12-15 07:12:32 +0500 |
commit | 780ab598eafdbc687b3cb12fee8d4ef12eaa105d (patch) | |
tree | 6415d15a3d500762074f9a44e55a06d7da8db9be /util | |
parent | 94be66cf24be135f0cae29cf06b1c669bc8fb84f (diff) | |
parent | 3ea11533c761072e32111a686910715fbae8d28a (diff) | |
download | prosody-780ab598eafdbc687b3cb12fee8d4ef12eaa105d.tar.gz prosody-780ab598eafdbc687b3cb12fee8d4ef12eaa105d.zip |
Merge 0.9->trunk
Diffstat (limited to 'util')
-rw-r--r-- | util/sasl/plain.lua | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/util/sasl/plain.lua b/util/sasl/plain.lua index ba4645e1..d108a40d 100644 --- a/util/sasl/plain.lua +++ b/util/sasl/plain.lua @@ -66,15 +66,11 @@ local function plain(self, message) self.username = authentication if state == false then return "failure", "account-disabled"; - elseif state == nil then + elseif state == nil or not correct then return "failure", "not-authorized", "Unable to authorize you with the authentication credentials you've sent."; end - if correct then - return "success"; - else - return "failure", "not-authorized", "Unable to authorize you with the authentication credentials you've sent."; - end + return "success"; end function init(registerMechanism) |