From f82f3cf06992ab0250f8c50ae9d052e393b36e0b Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Fri, 16 Jul 2010 21:11:10 +0000
Subject: [PATCH] Rename SslPemFile to SSLCertFile

This is *NOT* backward compatible with the old name for that config option. If
you updated to the latest nightly in the last two days, well, you'll have to
fix your config by hand. Sorry.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2088 726aef4b-f618-498e-8847-2d620e286838
---
 znc.cpp | 8 ++++----
 znc.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/znc.cpp b/znc.cpp
index 2db90f86..77f6ece1 100644
--- a/znc.cpp
+++ b/znc.cpp
@@ -459,7 +459,7 @@ void CZNC::InitDirs(const CString& sArgvPath, const CString& sDataDir) {
 		m_sZNCPath = sDataDir;
 	}
 
-	m_sPemFile = m_sZNCPath + "/znc.pem";
+	m_sSSLCertFile = m_sZNCPath + "/znc.pem";
 }
 
 CString CZNC::GetConfPath(bool bAllowMkDir) const {
@@ -535,7 +535,7 @@ bool CZNC::WriteConfig() {
 
 	m_LockFile.Write("AnonIPLimit  = " + CString(m_uiAnonIPLimit) + "\n");
 	m_LockFile.Write("MaxBufferSize= " + CString(m_uiMaxBufferSize) + "\n");
-	m_LockFile.Write("SslPemFile   = " + CString(m_sPemFile) + "\n");
+	m_LockFile.Write("SSLCertFile  = " + CString(m_sSSLCertFile) + "\n");
 
 	for (size_t l = 0; l < m_vpListeners.size(); l++) {
 		CListener* pListener = m_vpListeners[l];
@@ -1613,8 +1613,8 @@ bool CZNC::DoRehash(CString& sError)
 				} else if (sName.Equals("MaxBufferSize")) {
 					m_uiMaxBufferSize = sValue.ToUInt();
 					continue;
-				} else if (sName.Equals("SslPemFile")) {
-					m_sPemFile = sValue;
+				} else if (sName.Equals("SSLCertFile")) {
+					m_sSSLCertFile = sValue;
 					continue;
 				}
 			}
diff --git a/znc.h b/znc.h
index f0986ba9..d777350e 100644
--- a/znc.h
+++ b/znc.h
@@ -101,7 +101,7 @@ public:
 	CString GetConfPath(bool bAllowMkDir = true) const;
 	CString GetUserPath() const;
 	CString GetModPath() const;
-	CString GetPemLocation() const { return m_sPemFile; }
+	CString GetPemLocation() const { return m_sSSLCertFile; }
 	const CString& GetConfigFile() const { return m_sConfigFile; }
 	bool WritePemFile();
 	const CString& GetISpoofFile() const { return m_sISpoofFile; }
@@ -168,7 +168,7 @@ protected:
 	CString                m_sOrigISpoof;
 	CString                m_sISpoofFormat;
 	CString                m_sPidFile;
-	CString                m_sPemFile;
+	CString                m_sSSLCertFile;
 	VCString               m_vsVHosts;
 	VCString               m_vsMotd;
 	CFile                  m_LockFile;