util.sasl_cyrus: Protect the call to cyrussasl.server_new properly.

[prosody.git] / util / sasl_cyrus.lua

diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua
index d011e08b1e3a1ffb7ad53e65023eb389839bdf3b..f20aff51a8965d340efdacc1fa6f9fe3bea245ed 100644 (file)
--- a/util/sasl_cyrus.lua
+++ b/util/sasl_cyrus.lua
@@ -52,7 +52,14 @@ function new(realm, service_name)
 
        sasl_i.realm = realm;
        sasl_i.service_name = service_name;
-       sasl_i.cyrus = cyrussasl.server_new(service_name, nil, realm, nil, nil)
+
+       local st, ret = pcall(cyrussasl.server_new, service_name, nil, realm, nil, nil)
+       if st then
+               sasl_i.cyrus = ret;
+       else
+               log("error", "server_new failed: %s", ret);
+               return nil;
+       end
 
        if cyrussasl.set_canon_cb then
                local c14n_cb = function (user)
@@ -63,10 +70,6 @@ function new(realm, service_name)
                cyrussasl.set_canon_cb(sasl_i.cyrus, c14n_cb);
        end
 
-       if sasl_i.cyrus == 0 then
-               log("error", "got NULL return value from server_new")
-               return nil;
-       end
        cyrussasl.setssf(sasl_i.cyrus, 0, 0xffffffff)
        local s = setmetatable(sasl_i, method);
        return s;