Merge branch 'master' of github.com:znc/znc

modules/chansaver.cpp

@@ -76,6 +76,7 @@ private:
 
 template<> void TModInfo<CChanSaverMod>(CModInfo& Info) {
 	Info.SetWikiPage("chansaver");
+	Info.AddType(CModInfo::NetworkModule);
 }
 
 USERMODULEDEFS(CChanSaverMod, "Keep config up-to-date when user joins/parts")

modules/identfile.cpp

@@ -27,6 +27,9 @@ public:
 		AddCommand("SetFormat", static_cast<CModCommand::ModCmdFunc>(&CIdentFileModule::SetFormat),
 			"<format>");
 		AddCommand("Show",      static_cast<CModCommand::ModCmdFunc>(&CIdentFileModule::Show));
+
+		m_pISpoofLockFile = NULL;
+		m_pIRCSock = NULL;
 	}
 
 	virtual ~CIdentFileModule() {