aboutsummaryrefslogtreecommitdiffstats
path: root/util/sasl.lua
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2009-11-28 17:40:49 +0000
committerMatthew Wild <mwild1@gmail.com>2009-11-28 17:40:49 +0000
commitcfc34ec992be3feceed3497acb7b4b80ba7f259b (patch)
treeab9eef4b52e64e0601bf105926e77fe674a0230f /util/sasl.lua
parent4267a24ab79792f5e8ea993f84a6902beaabe94a (diff)
parentb022ba7fc29418504fcbe6890a784d3cef2cb265 (diff)
downloadprosody-cfc34ec992be3feceed3497acb7b4b80ba7f259b.tar.gz
prosody-cfc34ec992be3feceed3497acb7b4b80ba7f259b.zip
Merge with Tobias
Diffstat (limited to 'util/sasl.lua')
-rw-r--r--util/sasl.lua9
1 files changed, 5 insertions, 4 deletions
diff --git a/util/sasl.lua b/util/sasl.lua
index e3ae8087..9c8fff78 100644
--- a/util/sasl.lua
+++ b/util/sasl.lua
@@ -83,10 +83,11 @@ end
-- create a new SASL object which can be used to authenticate clients
function new(realm, profile, forbidden)
- sasl_i = {profile = profile};
+ local sasl_i = {profile = profile};
sasl_i.realm = realm;
- s = setmetatable(sasl_i, method);
- s:forbidden(sasl_i, forbidden)
+ local s = setmetatable(sasl_i, method);
+ if forbidden == nil then forbidden = {} end
+ s:forbidden(forbidden)
return s;
end
@@ -112,7 +113,7 @@ function method:mechanisms()
for backend, f in pairs(self.profile) do
if backend_mechanism[backend] then
for _, mechanism in ipairs(backend_mechanism[backend]) do
- if not sasl_i.restrict:contains(mechanism) then
+ if not self.restrict:contains(mechanism) then
mechanisms[mechanism] = true;
end
end