aboutsummaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2008-12-07 18:44:23 +0000
committerMatthew Wild <mwild1@gmail.com>2008-12-07 18:44:23 +0000
commit34ea788ae497f82755f225973ab2238fd111ee53 (patch)
tree888a20a7275c0d0ae0383ef6008c4805f3de5f95 /core
parent0595c7a86c4ebbdab236b9f3cf2de4be84f0b90d (diff)
parent8d26c23a92e18fb829cafe285b11b2ff2f693be7 (diff)
downloadprosody-34ea788ae497f82755f225973ab2238fd111ee53.tar.gz
prosody-34ea788ae497f82755f225973ab2238fd111ee53.zip
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'core')
-rw-r--r--core/s2smanager.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/s2smanager.lua b/core/s2smanager.lua
index ae834a9c..7827381d 100644
--- a/core/s2smanager.lua
+++ b/core/s2smanager.lua
@@ -43,7 +43,7 @@ local log = logger_init("s2smanager");
local sha256_hash = require "util.hashes".sha256;
-local dialback_secret = "This is very secret!!! Ha!";
+local dialback_secret = sha256_hash(tostring{} .. math.random() .. socket.gettime(), true);
local dns = require "net.dns";