aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-02-12 19:26:54 +0100
committerKim Alvefur <zash@zash.se>2014-02-12 19:26:54 +0100
commit741b175347e86a18273060fc884b1d5c8899cc5e (patch)
tree6eb49f8bddde74f4f7a621d0fb2770d60c093b4f
parent6d743a0544280a231a08d8ab6aeedf9d57090c2a (diff)
parenta8479fce152379d3e095aa0204aa022c5b47d4e0 (diff)
downloadprosody-741b175347e86a18273060fc884b1d5c8899cc5e.tar.gz
prosody-741b175347e86a18273060fc884b1d5c8899cc5e.zip
Merge 0.10 -> trunk
-rw-r--r--plugins/mod_admin_telnet.lua3
-rw-r--r--plugins/mod_ping.lua9
-rw-r--r--plugins/mod_s2s/s2sout.lib.lua3
-rw-r--r--plugins/mod_saslauth.lua2
-rw-r--r--plugins/mod_storage_sql2.lua4
5 files changed, 12 insertions, 9 deletions
diff --git a/plugins/mod_admin_telnet.lua b/plugins/mod_admin_telnet.lua
index e13d27c2..2aa9bd9b 100644
--- a/plugins/mod_admin_telnet.lua
+++ b/plugins/mod_admin_telnet.lua
@@ -22,8 +22,7 @@ local console_listener = { default_port = 5582; default_mode = "*a"; interface =
local iterators = require "util.iterators";
local keys, values = iterators.keys, iterators.values;
-local jid = require "util.jid";
-local jid_bare, jid_split = jid.bare, jid.split;
+local jid_bare, jid_split = import("util.jid", "bare", "prepped_split");
local set, array = require "util.set", require "util.array";
local cert_verify_identity = require "util.x509".verify_identity;
local envload = require "util.envload".envload;
diff --git a/plugins/mod_ping.lua b/plugins/mod_ping.lua
index eddb92d2..1a503409 100644
--- a/plugins/mod_ping.lua
+++ b/plugins/mod_ping.lua
@@ -11,14 +11,11 @@ local st = require "util.stanza";
module:add_feature("urn:xmpp:ping");
local function ping_handler(event)
- if event.stanza.attr.type == "get" then
- event.origin.send(st.reply(event.stanza));
- return true;
- end
+ return event.origin.send(st.reply(event.stanza));
end
-module:hook("iq/bare/urn:xmpp:ping:ping", ping_handler);
-module:hook("iq/host/urn:xmpp:ping:ping", ping_handler);
+module:hook("iq-get/bare/urn:xmpp:ping:ping", ping_handler);
+module:hook("iq-get/host/urn:xmpp:ping:ping", ping_handler);
-- Ad-hoc command
diff --git a/plugins/mod_s2s/s2sout.lib.lua b/plugins/mod_s2s/s2sout.lib.lua
index dbbef360..42b4281c 100644
--- a/plugins/mod_s2s/s2sout.lib.lua
+++ b/plugins/mod_s2s/s2sout.lib.lua
@@ -348,6 +348,9 @@ module:hook_global("service-added", function (event)
has_ipv4 = true;
end
end
+ if not (has_ipv4 or has_ipv6) then
+ module:log("warn", "No local IPv4 or IPv6 addresses detected, outgoing connections may fail");
+ end
end);
return s2sout;
diff --git a/plugins/mod_saslauth.lua b/plugins/mod_saslauth.lua
index 4513c511..94c060b3 100644
--- a/plugins/mod_saslauth.lua
+++ b/plugins/mod_saslauth.lua
@@ -245,7 +245,7 @@ module:hook("stream-features", function(event)
if origin.encrypted then
-- check wether LuaSec has the nifty binding to the function needed for tls-unique
-- FIXME: would be nice to have this check only once and not for every socket
- if origin.conn:socket().getpeerfinished then
+ if origin.conn:socket().getpeerfinished and origin.sasl_handler.add_cb_handler then
origin.sasl_handler:add_cb_handler("tls-unique", function(self)
return self.userdata:getpeerfinished();
end);
diff --git a/plugins/mod_storage_sql2.lua b/plugins/mod_storage_sql2.lua
index 90e9ead0..7a2ec4a7 100644
--- a/plugins/mod_storage_sql2.lua
+++ b/plugins/mod_storage_sql2.lua
@@ -325,6 +325,10 @@ function archive_store:delete(username, query)
local sql_query = "DELETE FROM `prosodyarchive` WHERE %s;";
local args = { host, user or "", store, };
local where = { "`host` = ?", "`user` = ?", "`store` = ?", };
+ if user == true then
+ table.remove(args, 2);
+ table.remove(where, 2);
+ end
archive_where(query, args, where);
archive_where_id_range(query, args, where);
sql_query = sql_query:format(t_concat(where, " AND "));