From bf162f683707a2774a60c3801ac4023231998bf5 Mon Sep 17 00:00:00 2001
From: Michael <michaelhazell@hotmail.com>
Date: Sat, 24 Oct 2020 17:40:47 -0400
Subject: [PATCH] Change glob matching to be configurable

---
 docs/conf/modules.conf.example |  3 +++
 src/modules/m_cban.cpp         | 19 +++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
index 0ab0c7451..49c9d99f8 100644
--- a/docs/conf/modules.conf.example
+++ b/docs/conf/modules.conf.example
@@ -338,6 +338,9 @@
 # This module is oper-only and provides /CBAN.
 # To use, CBAN must be in one of your oper class blocks.
 #<module name="cban">
+# CBAN does not allow glob channelmasks by default for compatibility
+# reasons. You can enable glob support by uncommenting the next line.
+#<cban glob="true">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # Censor module: Adds channel and user mode +G which block phrases that
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp
index dee844320..834498b58 100644
--- a/src/modules/m_cban.cpp
+++ b/src/modules/m_cban.cpp
@@ -36,6 +36,10 @@ enum
 	ERR_BADCHANNEL = 926
 };
 
+// Compatibility: Use glob matching?
+// InspIRCd versions 3.7.0 and below use only exact matching
+static bool glob = false;
+
 /** Holds a CBAN item
  */
 class CBan : public XLine
@@ -58,7 +62,10 @@ public:
 
 	bool Matches(const std::string& s) CXX11_OVERRIDE
 	{
-		return InspIRCd::Match(s, matchtext);
+		if (glob)
+			return InspIRCd::Match(s, matchtext);
+		else
+			return irc::equals(matchtext, s);
 	}
 
 	const std::string& Displayable() CXX11_OVERRIDE
@@ -184,6 +191,14 @@ class ModuleCBan : public Module, public Stats::EventListener
 		ServerInstance->XLines->UnregisterFactory(&f);
 	}
 
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("cban");
+
+		// XXX: Consider changing default behavior on the next major version
+		glob = tag->getBool("glob", false);
+	}
+
 	ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE
 	{
 		if (stats.GetSymbol() != 'C')
@@ -211,7 +226,7 @@ class ModuleCBan : public Module, public Stats::EventListener
 
 	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version("Adds the /CBAN command which allows server operators to prevent channels matching a glob from being created.", VF_COMMON | VF_VENDOR);
+		return Version("Adds the /CBAN command which allows server operators to prevent channels matching a glob from being created.", VF_COMMON | VF_VENDOR, glob ? "glob" : "");
 	}
 };
 
-- 
2.39.2