# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1228675463 0
# Node ID 9fba6b0401260231157b32526c6f6e92315d8a05
# Parent  08ed4fa2f89dadf16f7d7b01e29a5ccbb4a79743# Parent  6d9b2da9888f23c5a2ea822993202844f14fd0f9
Automated merge with http://waqas.ath.cx:8000/

diff -r 08ed4fa2f89d -r 9fba6b040126 core/s2smanager.lua
--- 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";
 
diff -r 08ed4fa2f89d -r 9fba6b040126 plugins/mod_posix.lua
--- 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);