prosody
9fba6b040126

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

596:9fba6b040126

Automated merge with http://waqas.ath.cx:8000/
author Matthew Wild <mwild1@gmail.com>
date Sun, 07 Dec 2008 18:44:23 +0000
parents 595:08ed4fa2f89d (current diff) 594:6d9b2da9888f (diff)
children 597:e33d384e1b2e
files
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/core/s2smanager.lua	Sun Dec 07 23:43:08 2008 +0500
+++ b/core/s2smanager.lua	Sun Dec 07 18:44:23 2008 +0000
@@ -43,7 +43,7 @@
 
 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";
 
--- a/plugins/mod_posix.lua	Sun Dec 07 23:43:08 2008 +0500
+++ b/plugins/mod_posix.lua	Sun Dec 07 18:44:23 2008 +0000
@@ -35,15 +35,13 @@
 			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);