tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make duplicate object definitions an error. 

Fixes #3638
This commit is contained in:
Gunnar Beutner 2014-03-20 15:37:59 +01:00
parent 3ad233400e
commit 95bf7ca560
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/config/config_parser.yy
View File

@ -366,6 +366,17 @@ object_declaration identifier T_STRING object_inherits_specifier expressionlist
{
ConfigItemBuilder::Ptr item = make_shared<ConfigItemBuilder>(yylloc);
ConfigItem::Ptr oldItem = ConfigItem::GetObject($3, $4);
if (oldItem) {
std::ostringstream msgbuf;
msgbuf << "Object '" << $4 << "' of type '" << $3 << "' re-defined; previous definition: " << oldItem->GetDebugInfo();
free($3);
free($4);
delete $5;
BOOST_THROW_EXCEPTION(std::invalid_argument(msgbuf.str()));
}
item->SetType($3);
if (strchr($4, '!') != NULL) {