core/s2smanager.lua

changeset 2420
6ccd36a95a81
parent 2419
00d985639a06
child 2421
83773aed9437
--- a/core/s2smanager.lua	Sun Jan 03 18:37:03 2010 +0000
+++ b/core/s2smanager.lua	Sun Jan 03 18:55:42 2010 +0000
@@ -41,7 +41,6 @@
 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;
@@ -431,7 +430,7 @@
 end
 
 function generate_dialback(id, to, from)
-	return sha256_hash(id..to..from..dialback_secret, true);
+	return sha256_hash(id..to..from..hosts[from].dialback_secret, true);
 end
 
 function verify_dialback(id, to, from, key)

mercurial