From 15a68932b6238cf52c3e86d1d029b0e65b8b755b Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 14 Dec 2021 15:54:51 +0000
Subject: If a user has a unique username then include it in bans.

---
 src/modules/m_dnsbl.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/modules/m_dnsbl.cpp')

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index dc43dda3f..6cfadff59 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -182,11 +182,11 @@ class DNSBLResolver : public DNS::Request
 				case DNSBLConfEntry::I_KLINE:
 				{
 					KLine* kl = new KLine(ServerInstance->Time(), ConfEntry->duration, 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();
 					}
@@ -200,11 +200,11 @@ class DNSBLResolver : public DNS::Request
 				case DNSBLConfEntry::I_GLINE:
 				{
 					GLine* gl = new GLine(ServerInstance->Time(), ConfEntry->duration, 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();
 					}
-- 
cgit v1.3.1-10-gc9f91