aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2013-10-10 22:27:01 +0100
committerMatthew Wild <mwild1@gmail.com>2013-10-10 22:27:01 +0100
commitb8308a01ffae00c3a0c9a9557036d6760c1cad57 (patch)
tree7ed25791ef2b73508310bd47230d070eaba5c02b /util
parenta732f8846e7fcb81ca1e098b0f73fd394d11df54 (diff)
parentfd4afeecb7be4bce7141a883cbfcb878c61af18d (diff)
downloadprosody-b8308a01ffae00c3a0c9a9557036d6760c1cad57.tar.gz
prosody-b8308a01ffae00c3a0c9a9557036d6760c1cad57.zip
Merge 0.10->trunk
Diffstat (limited to 'util')
-rw-r--r--util/sasl.lua3
1 files changed, 1 insertions, 2 deletions
diff --git a/util/sasl.lua b/util/sasl.lua
index 0d90880d..c8490842 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -18,7 +18,6 @@ local type = type
local setmetatable = setmetatable;
local assert = assert;
local require = require;
-local print = print
module "sasl"
@@ -48,7 +47,7 @@ local backend_mechanism = {};
local mechanism_channelbindings = {};
-- register a new SASL mechanims
-local function registerMechanism(name, backends, f, cb_backends)
+function registerMechanism(name, backends, f, cb_backends)
assert(type(name) == "string", "Parameter name MUST be a string.");
assert(type(backends) == "string" or type(backends) == "table", "Parameter backends MUST be either a string or a table.");
assert(type(f) == "function", "Parameter f MUST be a function.");