Allow <oper:classes> to specify classes in addition to <type:classes>

1 files changed, 10 insertions, 0 deletions

diff --git a/src/configreader.cpp b/src/configreader.cpp
index eca203a6c..8be723c10 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -264,6 +264,16 @@ void ServerConfig::CrossCheckOperClassType()
 		ifo->type_block = tblk->second->type_block;
 		ifo->class_blocks.assign(tblk->second->class_blocks.begin(), tblk->second->class_blocks.end());
 		oper_blocks[name] = ifo;
+
+		std::string classname;
+		irc::spacesepstream str(tag->getString("classes"));
+		while (str.GetToken(classname))
+		{
+			LocalIndex::iterator cls = operclass.find(classname);
+			if (cls == operclass.end())
+				throw CoreException("Oper " + name + " has missing class " + classname);
+			ifo->class_blocks.push_back(cls->second);
+		}
 	}
 }