diff options
| author |  Sadie Powell | 2021-12-14 16:56:48 +0000 |
|---|---|---|
| committer | Sadie Powell | 2021-12-14 16:56:48 +0000 |
| commit | e9d54724e6cf9ff3772795cf5eed4b259700214f (patch) | |
| tree | c7e06a9ca507df1db4eb5dc2e40a10da8198c086 /src/modules/m_dnsbl.cpp | |
| parent | Revert "Remove support for defaults in find_{compiler,linker}_flags()". (diff) | |
| parent | If a user has a unique username then include it in bans. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/modules/m_dnsbl.cpp')
| -rw-r--r-- | src/modules/m_dnsbl.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index a94d53058..203b75518 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -279,11 +279,11 @@ class DNSBLResolver final case DNSBLEntry::Action::KLINE: { KLine* kl = new KLine(ServerInstance->Time(), ConfEntry->xlineduration, ServerInstance->Config->ServerName.c_str(), reason.c_str(), - "*", them->GetIPString()); + them->GetBanIdent(), them->GetIPString()); if (ServerInstance->XLines->AddLine(kl,NULL)) { - ServerInstance->SNO.WriteToSnoMask('x', "K-line added due to DNSBL match on *@%s to expire in %s (on %s): %s", - them->GetIPString().c_str(), InspIRCd::DurationString(kl->duration).c_str(), + ServerInstance->SNO.WriteToSnoMask('x', "K-line added due to DNSBL match on %s to expire in %s (on %s): %s", + kl->Displayable().c_str(), InspIRCd::DurationString(kl->duration).c_str(), InspIRCd::TimeString(kl->expiry).c_str(), reason.c_str()); ServerInstance->XLines->ApplyLines(); } @@ -297,11 +297,11 @@ class DNSBLResolver final case DNSBLEntry::Action::GLINE: { GLine* gl = new GLine(ServerInstance->Time(), ConfEntry->xlineduration, ServerInstance->Config->ServerName.c_str(), reason.c_str(), - "*", them->GetIPString()); + them->GetBanIdent(), them->GetIPString()); if (ServerInstance->XLines->AddLine(gl,NULL)) { - ServerInstance->SNO.WriteToSnoMask('x', "G-line added due to DNSBL match on *@%s to expire in %s (on %s): %s", - them->GetIPString().c_str(), InspIRCd::DurationString(gl->duration).c_str(), + ServerInstance->SNO.WriteToSnoMask('x', "G-line added due to DNSBL match on %s to expire in %s (on %s): %s", + gl->Displayable().c_str(), InspIRCd::DurationString(gl->duration).c_str(), InspIRCd::TimeString(gl->expiry).c_str(), reason.c_str()); ServerInstance->XLines->ApplyLines(); } |