From ddf306850efb9e4059ecb0506b073b3af4d79dca Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 5 Apr 2022 22:57:14 +0100
Subject: Include the module name in the setter for server-added xlines.

---
 src/modules/m_connectban.cpp | 2 +-
 src/modules/m_dnsbl.cpp      | 6 +++---
 src/modules/m_rline.cpp      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/m_connectban.cpp b/src/modules/m_connectban.cpp
index a590e5b95..c24f03080 100644
--- a/src/modules/m_connectban.cpp
+++ b/src/modules/m_connectban.cpp
@@ -151,7 +151,7 @@ class ModuleConnectBan CXX11_FINAL
 			if (i->second >= threshold)
 			{
 				// Create Z-line for set duration.
-				ZLine* zl = new ZLine(ServerInstance->Time(), banduration, ServerInstance->Config->ServerName, banmessage, mask.str());
+				ZLine* zl = new ZLine(ServerInstance->Time(), banduration, MODNAME "@" + ServerInstance->Config->ServerName, banmessage, mask.str());
 				if (!ServerInstance->XLines->AddLine(zl, NULL))
 				{
 					delete zl;
diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 6cfadff59..35b750e97 100644
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -181,7 +181,7 @@ 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(),
+					KLine* kl = new KLine(ServerInstance->Time(), ConfEntry->duration, MODNAME "@" + ServerInstance->Config->ServerName, reason,
 							them->GetBanIdent(), them->GetIPString());
 					if (ServerInstance->XLines->AddLine(kl,NULL))
 					{
@@ -199,7 +199,7 @@ 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(),
+					GLine* gl = new GLine(ServerInstance->Time(), ConfEntry->duration, MODNAME "@" + ServerInstance->Config->ServerName, reason,
 							them->GetBanIdent(), them->GetIPString());
 					if (ServerInstance->XLines->AddLine(gl,NULL))
 					{
@@ -217,7 +217,7 @@ class DNSBLResolver : public DNS::Request
 				}
 				case DNSBLConfEntry::I_ZLINE:
 				{
-					ZLine* zl = new ZLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(),
+					ZLine* zl = new ZLine(ServerInstance->Time(), ConfEntry->duration, MODNAME "@" + ServerInstance->Config->ServerName, reason,
 							them->GetIPString());
 					if (ServerInstance->XLines->AddLine(zl,NULL))
 					{
diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp
index ecaf9b6a3..214095706 100644
--- a/src/modules/m_rline.cpp
+++ b/src/modules/m_rline.cpp
@@ -72,7 +72,7 @@ class RLine : public XLine
 	{
 		if (ZlineOnMatch)
 		{
-			ZLine* zl = new ZLine(ServerInstance->Time(), duration ? expiry - ServerInstance->Time() : 0, ServerInstance->Config->ServerName.c_str(), reason.c_str(), u->GetIPString());
+			ZLine* zl = new ZLine(ServerInstance->Time(), duration ? expiry - ServerInstance->Time() : 0, MODNAME "@" + ServerInstance->Config->ServerName, reason.c_str(), u->GetIPString());
 			if (ServerInstance->XLines->AddLine(zl, NULL))
 			{
 				std::string expirystr = zl->duration ? InspIRCd::Format(" to expire in %s (on %s)", InspIRCd::DurationString(zl->duration).c_str(), InspIRCd::TimeString(zl->expiry).c_str()) : "";
-- 
cgit v1.3.1-10-gc9f91