mirror of
https://github.com/znc/znc.git
synced 2026-03-28 17:42:41 +01:00
Fix regression of certauth introduced in r2118
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2187 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
@@ -26,6 +26,22 @@ public:
|
|||||||
for (it = vListeners.begin(); it != vListeners.end(); it++)
|
for (it = vListeners.begin(); it != vListeners.end(); it++)
|
||||||
(*it)->GetRealListener()->SetRequireClientCertFlags(SSL_VERIFY_PEER);
|
(*it)->GetRealListener()->SetRequireClientCertFlags(SSL_VERIFY_PEER);
|
||||||
|
|
||||||
|
MCString::iterator it1;
|
||||||
|
for (it1 = BeginNV(); it1 != EndNV(); it1++) {
|
||||||
|
VCString vsKeys;
|
||||||
|
VCString::iterator it2;
|
||||||
|
|
||||||
|
if (CZNC::Get().FindUser(it1->first) == NULL) {
|
||||||
|
DEBUG("Unknown user in saved data [" + it1->first + "]");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
it1->second.Split(" ", vsKeys, false);
|
||||||
|
for (it2 = vsKeys.begin(); it2 != vsKeys.end(); it2++) {
|
||||||
|
m_PubKeys[it1->first].insert(*it2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,22 +52,6 @@ public:
|
|||||||
virtual bool OnLoad(const CString& sArgs, CString& sMessage) {
|
virtual bool OnLoad(const CString& sArgs, CString& sMessage) {
|
||||||
OnBoot();
|
OnBoot();
|
||||||
|
|
||||||
MCString::iterator it;
|
|
||||||
for (it = BeginNV(); it != EndNV(); it++) {
|
|
||||||
VCString vsKeys;
|
|
||||||
VCString::iterator it2;
|
|
||||||
|
|
||||||
if (CZNC::Get().FindUser(it->first) == NULL) {
|
|
||||||
DEBUG("Unknown user in saved data [" + it->first + "]");
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
it->second.Split(" ", vsKeys, false);
|
|
||||||
for (it2 = vsKeys.begin(); it2 != vsKeys.end(); it2++) {
|
|
||||||
m_PubKeys[it->first].insert(*it2);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user