# HG changeset patch # User Matthew Wild # Date 1259255874 0 # Node ID 288832cdec52679e54379743c6d542230b514b63 # Parent aa830ab55bbc4fbb93b5b788d2301afc351af928 s2smanager: Allow configuration of the dialback_secret in the config diff -r aa830ab55bbc -r 288832cdec52 core/s2smanager.lua --- a/core/s2smanager.lua Thu Nov 26 13:06:52 2009 +0500 +++ b/core/s2smanager.lua Thu Nov 26 17:17:54 2009 +0000 @@ -36,13 +36,12 @@ 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;