Merge insp20

2 files changed, 6 insertions, 1 deletions

diff --git a/include/configreader.h b/include/configreader.h
index f2ba16902..fb93adafd 100644
--- a/include/configreader.h
+++ b/include/configreader.h
@@ -403,6 +403,10 @@ class CoreExport ServerConfig
 	 */
 	std::string HideKillsServer;
 
+	/** Set to hide kills from clients of ulined servers in snotices.
+	 */
+	bool HideULineKills;
+
 	/** The full pathname and filename of the PID
 	 * file as defined in the configuration.
 	 */
diff --git a/include/inspircd.h b/include/inspircd.h
index ee09070f8..303d24745 100644
--- a/include/inspircd.h
+++ b/include/inspircd.h
@@ -507,9 +507,10 @@ class CoreExport InspIRCd
 
 	/** Attempt to write the process id to a given file
 	 * @param filename The PID file to attempt to write to
+	 * @param exitonfail If true and the PID fail cannot be written log to stdout and exit, otherwise only log on failure
 	 * @return This function may bail if the file cannot be written
 	 */
-	void WritePID(const std::string &filename);
+	void WritePID(const std::string& filename, bool exitonfail = true);
 
 	/** This constructor initialises all the subsystems and reads the config file.
 	 * @param argc The argument count passed to main()