From bdeb21e98517638d43e5404f3d1e56a490176f1e Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Thu, 12 Mar 2026 15:29:39 +0000
Subject: Move <options:maskinlist> and <options:maskintopic> to <channels>.

---
 src/configreader.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/configreader.cpp')

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 8681272cb..b617cdc0a 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -377,8 +377,6 @@ void ServerConfig::Fill()
 	// Read the <options> config.
 	const auto& options = ConfValue("options");
 	CustomVersion = options->getString("customversion", security->getString("customversion"));
-	MaskInList = options->getBool("maskinlist");
-	MaskInTopic = options->getBool("maskintopic");
 	NoSnoticeStack = options->getBool("nosnoticestack");
 	SyntaxHints = options->getBool("syntaxhints");
 	XLineMessage = options->getString("xlinemessage", "You're banned!", 1);
@@ -394,6 +392,11 @@ void ServerConfig::Fill()
 		{ "ipv6", true                  },
 	});
 
+	// Read the <channels> config.
+	const auto& channels = ConfValue("channels", options);
+	MaskInList = channels->getBool("maskinlist");
+	MaskInTopic = channels->getBool("maskintopic");
+
 	// Read the <performance> config.
 	const auto& performance = ConfValue("performance");
 	MaxConn = performance->getNum<int>("somaxconn", SOMAXCONN, 1);
-- 
cgit v1.3.1-10-gc9f91