diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-11-26 17:17:54 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-11-26 17:17:54 +0000 |
| commit | fb4bbe19bf54b792b2321d2a4e95bca9c28360d9 (patch) | |
| tree | c1dd7ec539014fbf0fe932a403f24adf0da6dce6 /core/s2smanager.lua | |
| parent | d3aa2ff4e6469edb368f272bec11dff9658faaa4 (diff) | |
| download | prosody-fb4bbe19bf54b792b2321d2a4e95bca9c28360d9.tar.gz prosody-fb4bbe19bf54b792b2321d2a4e95bca9c28360d9.zip | |
s2smanager: Allow configuration of the dialback_secret in the config
Diffstat (limited to 'core/s2smanager.lua')
| -rw-r--r-- | core/s2smanager.lua | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua index 666022d1..f4d46802 100644 --- a/core/s2smanager.lua +++ b/core/s2smanager.lua @@ -36,13 +36,12 @@ local log = logger_init("s2smanager"); local sha256_hash = require "util.hashes".sha256; -local dialback_secret = uuid_gen(); - local adns, dns = require "net.adns", require "net.dns"; local config = require "core.configmanager"; local connect_timeout = config.get("*", "core", "s2s_timeout") or 60; local dns_timeout = config.get("*", "core", "dns_timeout") or 60; local max_dns_depth = config.get("*", "core", "dns_max_depth") or 3; +local dialback_secret = config.get("*", "core", "dialback_secret") or uuid_gen(); incoming_s2s = {}; _G.prosody.incoming_s2s = incoming_s2s; |