summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2010-03-10 01:39:46 +0000
committerdanieldg <danieldg@e03df62e-2008-0410-955e-edbf42e46eb7>2010-03-10 01:39:46 +0000
commit8bc87bd2447a6ffaccefe259aeb10e3ef109b112 (patch)
treeba8f5188d652b46c35be5c0bdf2b44944f7e98ed
parent5bbc2a31d69c82e04193b6a60c8e6ca5001685d2 (diff)
Complain when duplicate tags are found using ConfValue
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@12616 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/configreader.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp
index 75f17b61a..c8603f155 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -785,10 +785,15 @@ bool ServerConfig::StartsWithWindowsDriveLetter(const std::string &path)
ConfigTag* ServerConfig::ConfValue(const std::string &tag)
{
- ConfigDataHash::iterator iter = config_data.find(tag);
- if (iter == config_data.end())
+ ConfigTagList found = config_data.equal_range(tag);
+ if (found.first == found.second)
return NULL;
- return iter->second;
+ ConfigTag* rv = found.first->second;
+ found.first++;
+ if (found.first != found.second)
+ ServerInstance->Logs->Log("CONFIG",DEFAULT, "Multiple <" + tag + "> tags found; only first will be used "
+ "(first at " + rv->getTagLocation() + "; second at " + found.first->second->getTagLocation() + ")");
+ return rv;
}
ConfigTagList ServerConfig::ConfTags(const std::string& tag)