Merge with 0.6

[prosody.git] / util / sasl_cyrus.lua

diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua
index fd192233d6ed1742255f5e25098c8abf5ce0c3b6..57c6ba3cbb3b68c3ad6d1ef9f1b75e123ad94011 100644 (file)
--- a/util/sasl_cyrus.lua
+++ b/util/sasl_cyrus.lua
@@ -35,8 +35,11 @@ local initialized = false;
 
 local function init(service_name)
        if not initialized then
-               if pcall(cyrussasl.server_init, service_name) then
+               local st, errmsg = pcall(cyrussasl.server_init, service_name);
+               if st then
                        initialized = true;
+               else
+                       log("error", "Failed to initialize CyrusSASL: %s", errmsg);
                end
        end
 end
@@ -44,9 +47,9 @@ end
 -- create a new SASL object which can be used to authenticate clients
 function new(realm, service_name)
        local sasl_i = {};
-       
+
        init(service_name);
-       
+
        sasl_i.realm = realm;
        sasl_i.service_name = service_name;
        sasl_i.cyrus = cyrussasl.server_new(service_name, nil, nil, nil, nil)
@@ -110,7 +113,7 @@ function method:process(message)
             "undefined-condition",
             "SASL mechanism not available"
        elseif (err == -13) then -- SASL_BADAUTH
-          return "failure", "not-authorized"
+          return "failure", "not-authorized", cyrussasl.get_message( self.cyrus )
        else
           log("debug", "Got SASL error condition %d", err)
           return "failure",