diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-12-07 19:18:50 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-12-07 19:18:50 +0000 |
| commit | f48883b6ab37867f687aa6279f43da6a56cd40f1 (patch) | |
| tree | ac0e72316d86c2f578943a42491152bb8276e9c5 /core | |
| parent | 2e6fcdb2d0126ddf6dac449d950ffbf5c7c523ba (diff) | |
| parent | d3e7e2f1a7007f79edd38daf0adcf63e4fe950e3 (diff) | |
| download | prosody-f48883b6ab37867f687aa6279f43da6a56cd40f1.tar.gz prosody-f48883b6ab37867f687aa6279f43da6a56cd40f1.zip | |
Automated merge with http://waqas.ath.cx:8000/
Diffstat (limited to 'core')
| -rw-r--r-- | core/s2smanager.lua | 2 | ||||
| -rw-r--r-- | core/sessionmanager.lua | 2 |
2 files changed, 2 insertions, 2 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"; diff --git a/core/sessionmanager.lua b/core/sessionmanager.lua index a597e724..34cc9f0f 100644 --- a/core/sessionmanager.lua +++ b/core/sessionmanager.lua @@ -69,7 +69,7 @@ function destroy_session(session, err) local pres = st.presence{ type = "unavailable" }; if (not err) or err == "closed" then err = "connection closed"; end pres:tag("status"):text("Disconnected: "..err); - session.stanza_dispatch(pres); + session:dispatch_stanza(pres); end -- Remove session/resource from user's session list |