diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-04-22 21:32:23 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-04-22 21:32:23 +0100 |
| commit | ca9a9eb85ebb918983c845813c22c0e6d2464aa6 (patch) | |
| tree | 680b1c655c3a4b97e14f5dd996a303ff28e122cd /plugins/mod_saslauth.lua | |
| parent | a54da72215f3216f3ae28846604bba20e483b831 (diff) | |
| download | prosody-ca9a9eb85ebb918983c845813c22c0e6d2464aa6.tar.gz prosody-ca9a9eb85ebb918983c845813c22c0e6d2464aa6.zip | |
mod_*: Fix a load of global accesses
Diffstat (limited to 'plugins/mod_saslauth.lua')
| -rw-r--r-- | plugins/mod_saslauth.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 31d62325..f7b30aab 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -10,8 +10,10 @@ local st = require "util.stanza"; local sm_bind_resource = require "core.sessionmanager".bind_resource; +local sm_make_authenticated = require "core.sessionmanager".make_authenticated; local base64 = require "util.encodings".base64; +local datamanager_load = require "util.datamanager".load; local usermanager_validate_credentials = require "core.usermanager".validate_credentials; local t_concat, t_insert = table.concat, table.insert; local tostring = tostring; @@ -49,14 +51,14 @@ local function handle_status(session, status) session.sasl_handler = nil; elseif status == "success" then if not session.sasl_handler.username then error("SASL succeeded but we didn't get a username!"); end -- TODO move this to sessionmanager - sessionmanager.make_authenticated(session, session.sasl_handler.username); + sm_make_authenticated(session, session.sasl_handler.username); session.sasl_handler = nil; session:reset_stream(); end end local function password_callback(node, host, mechanism, decoder) - local password = (datamanager.load(node, host, "accounts") or {}).password; -- FIXME handle hashed passwords + local password = (datamanager_load(node, host, "accounts") or {}).password; -- FIXME handle hashed passwords local func = function(x) return x; end; if password then if mechanism == "PLAIN" then |