From 367052b11183ae48ca5b5c38493ff22fba943b56 Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 18 Mar 2010 10:10:37 +0000 Subject: util.sasl_cyrus: Return invalid-mechanism instead of undefined-condition where appropriate --- util/sasl_cyrus.lua | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua index 7e0cbc29..b5b0e08d 100644 --- a/util/sasl_cyrus.lua +++ b/util/sasl_cyrus.lua @@ -123,16 +123,12 @@ function method:process(message) return "challenge", data elseif (err == -4) then -- SASL_NOMECH log("debug", "SASL mechanism not available from remote end") - return "failure", - "undefined-condition", - "SASL mechanism not available" + return "failure", "invalid-mechanism", "SASL mechanism not available" elseif (err == -13) then -- SASL_BADAUTH return "failure", "not-authorized", cyrussasl.get_message( self.cyrus ) else log("debug", "Got SASL error condition %d", err) - return "failure", - "undefined-condition", - cyrussasl.get_message( self.cyrus ) + return "failure", "undefined-condition", cyrussasl.get_message( self.cyrus ) end end -- cgit v1.2.3