adam/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-08-09 10:23:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexey Sokolov
2015-08-04 23:48:52 +01:00
parent f7ccbed99a 23fb93d1c6
commit 603288999b
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/znc/IRCNetwork.h
+1
View File
@@ -127,6 +127,7 @@ public:
const SCString& GetTrustedFingerprints() const { return m_ssTrustedFingerprints; }
void AddTrustedFingerprint(const CString& sFP) { m_ssTrustedFingerprints.insert(sFP.Escape_n(CString::EHEXCOLON, CString::EHEXCOLON)); }
void DelTrustedFingerprint(const CString& sFP) { m_ssTrustedFingerprints.erase(sFP); }
void ClearTrustedFingerprints() { m_ssTrustedFingerprints.clear(); }
void SetIRCConnectEnabled(bool b);
bool GetIRCConnectEnabled() const { return m_bIRCConnectEnabled; }
include/znc/User.h
+2
View File
@@ -63,6 +63,8 @@ public:
CConfig ToConfig() const;
bool CheckPass(const CString& sPass) const;
bool AddAllowedHost(const CString& sHostMask);
bool RemAllowedHost(const CString& sHostMask);
void ClearAllowedHosts();
bool IsHostAllowed(const CString& sHostMask) const;
bool IsValid(CString& sErrMsg, bool bSkipPass = false) const;
static bool IsValidUserName(const CString& sUserName);
modules/webadmin.cpp
+1 -3
View File
@@ -1049,9 +1049,7 @@ public:
}
WebSock.GetRawParam("fingerprints").Split("\n", vsArgs);
while (!pNetwork->GetTrustedFingerprints().empty()) {
pNetwork->DelTrustedFingerprint(*pNetwork->GetTrustedFingerprints().begin());
}
pNetwork->ClearTrustedFingerprints();
for (const CString& sFP : vsArgs) {
pNetwork->AddTrustedFingerprint(sFP);
}
src/User.cpp
+6
View File
@@ -791,6 +791,12 @@ bool CUser::AddAllowedHost(const CString& sHostMask) {
m_ssAllowedHosts.insert(sHostMask);
return true;
}
bool CUser::RemAllowedHost(const CString& sHostMask) {
return m_ssAllowedHosts.erase(sHostMask) > 0;
}
void CUser::ClearAllowedHosts() {
m_ssAllowedHosts.clear();
}
bool CUser::IsHostAllowed(const CString& sHostMask) const {
if (m_ssAllowedHosts.empty()) {