Only set spDaemon in Daemon::Main, to allow Boxi to have a BackupDaemon

and a BackupStoreDaemon in the same process in separate threads.

Separate out Configure(filename) and Configure(Configuration) for Boxi.

Use a std::auto_ptr to hold the Configuration so that we don't have to 
worry about releasing it ourselves.

Remove some #ifdef WIN32.

1 files changed, 6 insertions, 1 deletions

diff --git a/lib/server/Daemon.h b/lib/server/Daemon.h
index e399a0ef..52faf38b 100644
--- a/lib/server/Daemon.h
+++ b/lib/server/Daemon.h
@@ -56,6 +56,7 @@ public:
 	virtual void Usage();
 
 	virtual bool Configure(const std::string& rConfigFileName);
+	virtual bool Configure(const Configuration& rConfig);
 
 	bool StopRun() {return mReloadConfigWanted | mTerminateWanted;}
 	bool IsReloadConfigWanted() {return mReloadConfigWanted;}
@@ -72,6 +73,10 @@ public:
 	{
 		mRunInForeground = foreground;
 	}
+	void SetSingleProcess(bool value)
+	{
+		mSingleProcess = value;
+	}
 
 protected:
 	virtual void SetupInInitialProcess();
@@ -85,7 +90,7 @@ private:
 	box_time_t GetConfigFileModifiedTime() const;
 	
 	std::string mConfigFileName;
-	Configuration *mpConfiguration;
+	std::auto_ptr<Configuration> mapConfiguration;
 	box_time_t mLoadedConfigModifiedTime;
 	bool mReloadConfigWanted;
 	bool mTerminateWanted;