diff options
| author | Waqas Hussain <waqas20@gmail.com> | 2009-07-06 01:40:43 +0500 |
|---|---|---|
| committer | Waqas Hussain <waqas20@gmail.com> | 2009-07-06 01:40:43 +0500 |
| commit | 55a4aba43837ed228153ff38faef177177b46980 (patch) | |
| tree | 13268c35d06d5ca5a9abc67482f976c9103d92e0 /plugins | |
| parent | bfba1b141b6b2e95940c056eaa8e1bd7f7bd8a21 (diff) | |
| parent | fa97be5e4dcd83cd57c51e764f6aa2a39b9833ba (diff) | |
| download | prosody-55a4aba43837ed228153ff38faef177177b46980.tar.gz prosody-55a4aba43837ed228153ff38faef177177b46980.zip | |
Merged with trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_console.lua | 13 | ||||
| -rw-r--r-- | plugins/mod_saslauth.lua | 5 |
2 files changed, 15 insertions, 3 deletions
diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua index 0f2c6711..966156f8 100644 --- a/plugins/mod_console.lua +++ b/plugins/mod_console.lua @@ -437,6 +437,8 @@ end ------------- function printbanner(session) + local option = config.get("*", "core", "console_banner"); +if option == nil or option == "full" or option == "graphic" then session.print [[ ____ \ / _ | _ \ _ __ ___ ___ _-_ __| |_ _ @@ -446,7 +448,18 @@ session.print [[ A study in simplicity |___/ ]] +end +if option == nil or option == "short" or option == "full" then session.print("Welcome to the Prosody administration console. For a list of commands, type: help"); session.print("You may find more help on using this console in our online documentation at "); session.print("http://prosody.im/doc/console\n"); end +if option and option ~= "short" and option ~= "full" and option ~= "graphic" then + if type(option) == "string" then + session.print(option) + elseif type(option) == "function" then + setfenv(option, redirect_output(_G, session)); + pcall(option, session); + end +end +end diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua index 754c82b3..81113d7c 100644 --- a/plugins/mod_saslauth.lua +++ b/plugins/mod_saslauth.lua @@ -12,7 +12,6 @@ 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 to_unicode = require "util.encodings".idna.to_unicode; local datamanager_load = require "util.datamanager".load; local usermanager_validate_credentials = require "core.usermanager".validate_credentials; @@ -66,13 +65,13 @@ local function handle_status(session, status) end local function password_callback(node, hostname, realm, mechanism, decoder) - local password = (datamanager_load(node, to_unicode(hostname), "accounts") or {}).password; -- FIXME handle hashed passwords + local password = (datamanager_load(node, hostname, "accounts") or {}).password; -- FIXME handle hashed passwords local func = function(x) return x; end; if password then if mechanism == "PLAIN" then return func, password; elseif mechanism == "DIGEST-MD5" then - if decoder then node, hostname, password = decoder(node), decoder(hostname), decoder(password); end + if decoder then node, realm, password = decoder(node), decoder(realm), decoder(password); end return func, md5(node..":"..realm..":"..password); end end |