aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-05 19:50:34 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-05 19:50:34 +0000
commitfe6e46a55f68f566290250655247cd1393ae6d2c (patch)
tree1cf6e6e0fad1a9efd467895c02e748522dc2ca06 /plugins
parentb2afc52730ae023a4fa3c4da525b3d1f92e5f1b9 (diff)
parentc016526d9d5b57c8b6157cba7eee4bb268e1e9b4 (diff)
downloadprosody-fe6e46a55f68f566290250655247cd1393ae6d2c.tar.gz
prosody-fe6e46a55f68f566290250655247cd1393ae6d2c.zip
Merge
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_console.lua2
-rw-r--r--plugins/mod_saslauth.lua8
2 files changed, 3 insertions, 7 deletions
diff --git a/plugins/mod_console.lua b/plugins/mod_console.lua
index 9b9fc217..4ac3c5fe 100644
--- a/plugins/mod_console.lua
+++ b/plugins/mod_console.lua
@@ -33,7 +33,7 @@ function console:new_session(conn)
local w = conn.write;
local session = { conn = conn;
send = function (t) w(tostring(t)); end;
- print = function (t) w("| "..tostring(t).."\r\n"); end;
+ print = function (t) w("| "..tostring(t).."\n"); end;
disconnect = function () conn.close(); end;
};
session.env = setmetatable({}, default_env_mt);
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index d0ba8542..52ef68c7 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -24,8 +24,6 @@ local sm_bind_resource = require "core.sessionmanager".bind_resource;
local jid
local base64 = require "util.encodings".base64;
-local gettime = require "socket".gettime;
-
local usermanager_validate_credentials = require "core.usermanager".validate_credentials;
local t_concat, t_insert = table.concat, table.insert;
local tostring = tostring;
@@ -66,14 +64,14 @@ local function handle_status(session, status)
end
end
-local function password_callback(node, host, mechanism)
+local function password_callback(node, host, mechanism, raw_host)
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
return func, password;
elseif mechanism == "DIGEST-MD5" then
- return func, md5(node..":"..host..":"..password);
+ return func, md5(node..":"..raw_host..":"..password);
end
end
return func, nil;
@@ -144,8 +142,6 @@ module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-bind",
:tag("bind", { xmlns = xmlns_bind})
:tag("jid"):text(session.full_jid));
end
-
- session.log("******", "Connection took "..tostring(session.conntimetotal).." seconds");
end);
module:add_iq_handler("c2s", "urn:ietf:params:xml:ns:xmpp-session",