# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1392229582 -3600
# Node ID ac0879a8190a211f0beeb7768709cd7ab6d92c7c
# Parent  d61026bee038d31c804cb2fb38e6ee3998518058# Parent  eb05360e85256d8331cd816ab2dac3238aafae73
Merge 0.9 -> 0.10

diff -r d61026bee038 -r ac0879a8190a plugins/mod_admin_telnet.lua
--- 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;
diff -r d61026bee038 -r ac0879a8190a plugins/mod_s2s/s2sout.lib.lua
--- 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;