Software / code / prosody
Changeset
6017:ac0879a8190a
Merge 0.9 -> 0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Wed, 12 Feb 2014 19:26:22 +0100 |
| parents | 6014:d61026bee038 (current diff) 6016:eb05360e8525 (diff) |
| children | 6018:4a276653a2c9 6019:e9147a16059d 6091:3a1c39b31497 |
| files | plugins/mod_admin_telnet.lua plugins/mod_s2s/s2sout.lib.lua |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_admin_telnet.lua Wed Feb 12 19:25:15 2014 +0100 +++ b/plugins/mod_admin_telnet.lua Wed Feb 12 19:26:22 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_s2s/s2sout.lib.lua Wed Feb 12 19:25:15 2014 +0100 +++ b/plugins/mod_s2s/s2sout.lib.lua Wed Feb 12 19:26:22 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;
