Software / code / prosody
Changeset
6018:4a276653a2c9
Merge 0.10 -> trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 12 Feb 2014 19:26:54 +0100 |
| parents | 6011:a35c9e52b02e (current diff) 6017:ac0879a8190a (diff) |
| children | 6020:69d12c3fe991 |
| files | |
| diffstat | 5 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_admin_telnet.lua Thu Feb 06 10:55:09 2014 +0100 +++ b/plugins/mod_admin_telnet.lua Wed Feb 12 19:26:54 2014 +0100 @@ -22,8 +22,7 @@ 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;
--- a/plugins/mod_ping.lua Thu Feb 06 10:55:09 2014 +0100 +++ b/plugins/mod_ping.lua Wed Feb 12 19:26:54 2014 +0100 @@ -11,14 +11,11 @@ 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
--- a/plugins/mod_s2s/s2sout.lib.lua Thu Feb 06 10:55:09 2014 +0100 +++ b/plugins/mod_s2s/s2sout.lib.lua Wed Feb 12 19:26:54 2014 +0100 @@ -348,6 +348,9 @@ 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;
--- a/plugins/mod_saslauth.lua Thu Feb 06 10:55:09 2014 +0100 +++ b/plugins/mod_saslauth.lua Wed Feb 12 19:26:54 2014 +0100 @@ -245,7 +245,7 @@ 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);
--- a/plugins/mod_storage_sql2.lua Thu Feb 06 10:55:09 2014 +0100 +++ b/plugins/mod_storage_sql2.lua Wed Feb 12 19:26:54 2014 +0100 @@ -325,6 +325,10 @@ 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 "));
