pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-28 15:56:38 +02:00
Code Activity

Fixed bug #1190 and prevent m_dnsbl from akilling a user multiple times if they are in multiple blacklists

Browse Source
This commit is contained in:
Adam
2010-09-17 14:32:46 -04:00
parent 61e7564633
commit 74566d869a
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/extra/m_dnsbl.cpp
+3 -1
View File
@@ -27,9 +27,11 @@ class DNSBLResolver : public DNSRequest
void OnLookupComplete(const DNSRecord *)
{
if (!user)
if (!user || user->GetExt("m_dnsbl_akilled"))
return;
user->Extend("m_dnsbl_akilled");
Anope::string reason = this->blacklist.reason;
reason = reason.replace_all_ci("%i", user->ip.addr());
reason = reason.replace_all_ci("%h", user->host);
src/regchannel.cpp
+3 -2
View File
@@ -394,9 +394,10 @@ void ChannelInfo::LoadMLock()
if (this->HasFlag(CI_PERSIST) && !this->c)
{
this->c = new Channel(this->name, this->time_registered);
if (!this->bi)
if (!this->bi && ModeManager::FindChannelModeByName(CMODE_PERM) == NULL)
ChanServ->Assign(NULL, this);
this->bi->Join(c);
else if (this->bi)
this->bi->Join(c);
check_modes(this->c);
this->CheckTopic();
}