aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-02-12 19:26:22 +0100
committerKim Alvefur <zash@zash.se>2014-02-12 19:26:22 +0100
commita8479fce152379d3e095aa0204aa022c5b47d4e0 (patch)
tree32c8de1b1bd02761e9b058e38b71d78871078c54
parent4078dc07a2a867aa7e7f010c63a9a85b52c433ee (diff)
parentbc6f1c6085f6e248acefa7dd110d5f21a262fe8f (diff)
downloadprosody-a8479fce152379d3e095aa0204aa022c5b47d4e0.tar.gz
prosody-a8479fce152379d3e095aa0204aa022c5b47d4e0.zip
Merge 0.9 -> 0.10
-rw-r--r--plugins/mod_admin_telnet.lua3
-rw-r--r--plugins/mod_s2s/s2sout.lib.lua3
2 files changed, 4 insertions, 2 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_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;