From 4d4959540caf49b9659e9d952f8dbdf561c1b544 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Thu, 3 Jun 2010 18:01:05 +0500 Subject: mod_presence: Send unavailable presence in response to probes to the sender's full JID, not bare JID. --- plugins/mod_presence.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua index 9071ae4c..4fb8c3e4 100644 --- a/plugins/mod_presence.lua +++ b/plugins/mod_presence.lua @@ -231,7 +231,7 @@ function handle_inbound_presence_subscriptions_and_probes(origin, stanza, from_b local result, err = rostermanager.is_contact_subscribed(node, host, from_bare); if result then if 0 == send_presence_of_available_resources(node, host, st_from, origin, core_route_stanza) then - core_route_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unavailable"})); -- TODO send last activity + core_route_stanza(hosts[host], st.presence({from=to_bare, to=st_from, type="unavailable"})); -- TODO send last activity end elseif not err then core_route_stanza(hosts[host], st.presence({from=to_bare, to=from_bare, type="unsubscribed"})); -- cgit v1.2.3 From 03ffab383cb0c807a1c6370f169b9bff887874ea Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Thu, 3 Jun 2010 17:47:51 +0500 Subject: util.sasl.scram: Fixed a log level. --- util/sasl/scram.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/sasl/scram.lua b/util/sasl/scram.lua index 52656a89..1340423c 100644 --- a/util/sasl/scram.lua +++ b/util/sasl/scram.lua @@ -105,7 +105,7 @@ function saltedPasswordSHA1(password, salt, iteration_count) return false, "inappropriate argument types" end if iteration_count < 4096 then - log("warning", "Iteration count < 4096 which is the suggested minimum according to RFC 5802.") + log("warn", "Iteration count < 4096 which is the suggested minimum according to RFC 5802.") end return true, Hi(hmac_sha1, password, salt, iteration_count); -- cgit v1.2.3 From c49bc6b7102dc672237f8d4579f07bf57e6b9488 Mon Sep 17 00:00:00 2001 From: Waqas Hussain Date: Thu, 3 Jun 2010 18:09:02 +0500 Subject: util.sasl_cyrus: Log the textual representation of unknown Cyrus SASL errors, not just the error code. --- util/sasl_cyrus.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/sasl_cyrus.lua b/util/sasl_cyrus.lua index b5f505eb..add7fe45 100644 --- a/util/sasl_cyrus.lua +++ b/util/sasl_cyrus.lua @@ -127,7 +127,7 @@ function method:process(message) elseif (err == -13) then -- SASL_BADAUTH return "failure", "not-authorized", cyrussasl.get_message( self.cyrus ) else - log("debug", "Got SASL error condition %d", err) + log("debug", "Got SASL error condition %d: %s", err, cyrussasl.get_message( self.cyrus )) return "failure", "undefined-condition", cyrussasl.get_message( self.cyrus ) end end -- cgit v1.2.3