projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mod_saslauth: Make service_name configurable for CyrusSASL users.
[prosody.git]
/
util
/
sasl.lua
diff --git
a/util/sasl.lua
b/util/sasl.lua
index 7b7db0247ae50efa6537002a65fb71ed30562a20..9c8fff7804a28edd6b7e4e430b846d3d23093696 100644
(file)
--- a/
util/sasl.lua
+++ b/
util/sasl.lua
@@
-83,13
+83,19
@@
end
-- create a new SASL object which can be used to authenticate clients
function new(realm, profile, forbidden)
-- 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;
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
return s;
end
+-- get a fresh clone with the same realm, profiles and forbidden mechanisms
+function method:clean_clone()
+ return new(self.realm, self.profile, self:forbidden())
+end
+
-- set the forbidden mechanisms
function method:forbidden( restrict )
if restrict then
-- set the forbidden mechanisms
function method:forbidden( restrict )
if restrict then
@@
-107,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
for backend, f in pairs(self.profile) do
if backend_mechanism[backend] then
for _, mechanism in ipairs(backend_mechanism[backend]) do
- if not s
asl_i
.restrict:contains(mechanism) then
+ if not s
elf
.restrict:contains(mechanism) then
mechanisms[mechanism] = true;
end
end
mechanisms[mechanism] = true;
end
end