aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Aurich <paul@darkrain42.org>2010-03-17 18:57:19 -0700
committerPaul Aurich <paul@darkrain42.org>2010-03-17 18:57:19 -0700
commit8ec1bec1fece3058a59ce275b08779859bc9654b (patch)
tree325b35bf736cefc9b4381bde11d11fa4e52893b4
parentf858b0f2589934bd1edd03ff463932f1f4f2dfbf (diff)
downloadprosody-8ec1bec1fece3058a59ce275b08779859bc9654b.tar.gz
prosody-8ec1bec1fece3058a59ce275b08779859bc9654b.zip
util.sasl_cyrus: Protect the call to cyrussasl.server_new properly.
-rw-r--r--util/sasl_cyrus.lua13
1 files changed, 8 insertions, 5 deletions
diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua
index d011e08b..f20aff51 100644
--- 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;