Software / code / prosody
Changeset
4570:9612abc89dd1
mod_s2s, s2sout.lib: import cert verify and add another fallback method in case socket.local_addresses isn't there.
| author | Marco Cirillo <maranda@lightwitch.org> |
|---|---|
| date | Fri, 24 Feb 2012 15:34:25 +0000 |
| parents | 4569:34b1122126f6 |
| children | 4571:32d532b95dc7 |
| files | plugins/s2s/mod_s2s.lua plugins/s2s/s2sout.lib.lua |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/s2s/mod_s2s.lua Fri Feb 24 15:24:10 2012 +0000 +++ b/plugins/s2s/mod_s2s.lua Fri Feb 24 15:34:25 2012 +0000 @@ -20,6 +20,7 @@ local s2s_new_outgoing = require "core.s2smanager".new_outgoing; local s2s_destroy_session = require "core.s2smanager".destroy_session; local uuid_gen = require "util.uuid".generate; +local cert_verify_identity = require "util.x509".verify_identity; local s2sout = module:require("s2sout");
--- a/plugins/s2s/s2sout.lib.lua Fri Feb 24 15:24:10 2012 +0000 +++ b/plugins/s2s/s2sout.lib.lua Fri Feb 24 15:34:25 2012 +0000 @@ -24,7 +24,7 @@ local s2s_new_outgoing = require "core.s2smanager".new_outgoing; local s2s_destroy_session = require "core.s2smanager".destroy_session; -local cfg_sources = config.get("*", "core", "s2s_interfaces") or socket.local_addresses(); +local cfg_sources = config.get("*", "core", "s2s_interfaces") or socket.local_addresses and socket.local_addresses() or { "*" }; local s2sout = {};
