From 4dc31cdafcd70b279896369059a87f2162ea3cbb Mon Sep 17 00:00:00 2001
From: Daniel De Graaf
Date: Tue, 9 Mar 2010 19:37:23 -0600
Subject: Complain when duplicate tags are found using ConfValue

---
 src/configreader.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/configreader.cpp')

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 21625aa2c..017a59393 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -727,10 +727,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)
-- 
cgit v1.3.1-10-gc9f91