diff options
| author | Matthew Wild <mwild1@gmail.com> | 2008-12-07 18:44:23 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2008-12-07 18:44:23 +0000 |
| commit | 34ea788ae497f82755f225973ab2238fd111ee53 (patch) | |
| tree | 888a20a7275c0d0ae0383ef6008c4805f3de5f95 | |
| parent | 0595c7a86c4ebbdab236b9f3cf2de4be84f0b90d (diff) | |
| parent | 8d26c23a92e18fb829cafe285b11b2ff2f693be7 (diff) | |
| download | prosody-34ea788ae497f82755f225973ab2238fd111ee53.tar.gz prosody-34ea788ae497f82755f225973ab2238fd111ee53.zip | |
Automated merge with http://waqas.ath.cx:8000/
| -rw-r--r-- | core/s2smanager.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_posix.lua | 4 |
2 files changed, 2 insertions, 4 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/plugins/mod_posix.lua b/plugins/mod_posix.lua index 8dc4c77d..7559d3ed 100644 --- a/plugins/mod_posix.lua +++ b/plugins/mod_posix.lua @@ -35,15 +35,13 @@ if not config_get("*", "core", "no_daemonize") then log("info", "Daemonized to pid %d", ret); os.exit(0); else - log("info", "Successfully daemonized"); - if logwriter then local ok, ret = logger_set(logwriter); if not ok then log("error", "Couldn't set new log output: %s", ret); end end - + log("info", "Successfully daemonized"); end end module:add_event_hook("server-starting", daemonize_server); |