Merge 0.7->trunk

[prosody.git] / util / sasl_cyrus.lua

diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua
index f20aff51a8965d340efdacc1fa6f9fe3bea245ed..b5b0e08d0a5adf1662075bf024fc93e85ced0c6a 100644 (file)
--- a/util/sasl_cyrus.lua
+++ b/util/sasl_cyrus.lua
@@ -39,7 +39,7 @@ local function init(service_name)
                if st then
                        initialized = true;
                else
-                       log("error", "Failed to initialize CyrusSASL: %s", errmsg);
+                       log("error", "Failed to initialize Cyrus SASL: %s", errmsg);
                end
        end
 end
@@ -57,7 +57,7 @@ function new(realm, service_name)
        if st then
                sasl_i.cyrus = ret;
        else
-               log("error", "server_new failed: %s", ret);
+               log("error", "Creating SASL server connection failed: %s", ret);
                return nil;
        end
 
@@ -82,7 +82,7 @@ end
 
 -- set the forbidden mechanisms
 function method:forbidden( restrict )
-       log("debug", "Called method:forbidden. NOT IMPLEMENTED.")
+       log("warn", "Called method:forbidden. NOT IMPLEMENTED.")
        return {}
 end
 
@@ -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