projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a5b0870
)
mod_saslauth: Fix coding style and layout, and use of arg[] for vararg
author
Matthew Wild
<mwild1@gmail.com>
Wed, 5 Aug 2009 15:37:28 +0000
(16:37 +0100)
committer
Matthew Wild
<mwild1@gmail.com>
Wed, 5 Aug 2009 15:37:28 +0000
(16:37 +0100)
plugins/mod_saslauth.lua
patch
|
blob
|
history
diff --git
a/plugins/mod_saslauth.lua
b/plugins/mod_saslauth.lua
index 485930317fa8a9ab15e5c3c10339066a568c61aa..8d3b4ae40133be814cc6dbb7b2d408df7f161d46 100644
(file)
--- a/
plugins/mod_saslauth.lua
+++ b/
plugins/mod_saslauth.lua
@@
-69,16
+69,21
@@
end
local function credentials_callback(mechanism, ...)
if mechanism == "PLAIN" then
local function credentials_callback(mechanism, ...)
if mechanism == "PLAIN" then
- local username, hostname, password = arg[1], arg[2], arg[3];
- local response = usermanager_validate_credentials(hostname, username, password, mechanism)
- if response == nil then return false
- else return response end
+ local username, hostname, password = ...;
+ local response = usermanager_validate_credentials(hostname, username, password, mechanism);
+ if response == nil then
+ return false;
+ else
+ return response;
+ end
elseif mechanism == "DIGEST-MD5" then
function func(x) return x; end
elseif mechanism == "DIGEST-MD5" then
function func(x) return x; end
- local node, domain, realm, decoder =
arg[1], arg[2], arg[3], arg[4]
;
- local password = usermanager_get_password(node, domain)
+ local node, domain, realm, decoder =
...
;
+ local password = usermanager_get_password(node, domain)
;
if password then
if password then
- if decoder then node, realm, password = decoder(node), decoder(realm), decoder(password); end
+ if decoder then
+ node, realm, password = decoder(node), decoder(realm), decoder(password);
+ end
return func, md5(node..":"..realm..":"..password);
else
return func, nil;
return func, md5(node..":"..realm..":"..password);
else
return func, nil;