Fix yet another validation issue.

Refs #5925

diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index c1263a15f62b5fcf54a61c58c23b46c83416ba1a..e86d3c0964328f8e3f1ceae8ff0f1a2d94dd9421 100644 (file)
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -117,10 +117,8 @@ Dictionary::Ptr ConfigItem::GetProperties(void)
        if (!m_Properties) {
                m_Properties = make_shared<Dictionary>();
                m_Properties->Set("type", m_Type);
-               m_Properties->Set("name", m_Name);
                m_Properties->Set("__parent", m_Scope);
                GetExpressionList()->Evaluate(m_Properties);
-               m_Properties->Remove("name");
                m_Properties->Remove("__parent");
 
                String name = m_Name;
@@ -136,6 +134,9 @@ Dictionary::Ptr ConfigItem::GetProperties(void)
                        }
                }
 
+               if (name != m_Name)
+                       m_Properties->Set("name", m_Name);
+
                m_Properties->Set("__name", name);
 
                VERIFY(m_Properties->Get("type") == GetType());

diff --git a/lib/icinga/icinga-type.conf b/lib/icinga/icinga-type.conf
index 511e8714d9deff311be87e9479bc40d64ee62935..b1c1850b808449c63dacec35dcb911c8b3ab9d48 100644 (file)
--- a/lib/icinga/icinga-type.conf
+++ b/lib/icinga/icinga-type.conf
@@ -85,6 +85,8 @@
        %attribute %name(Host) "host_name",
        %attribute %string "service_name",
 
+       %attribute %string "name",
+
        %attribute %array "users" {
                %attribute %name(User) "*"
        },
@@ -191,6 +193,8 @@
        %attribute %name(Host) "host_name",
        %attribute %string "service_name",
 
+       %attribute %string "name",
+
        %require "author",
        %attribute %string "author",
 
@@ -215,6 +219,8 @@
        %attribute %name(Host) "child_host_name",
        %attribute %string "child_service_name",
 
+       %attribute %string "name",
+
        %attribute %name(TimePeriod) "period",
 
        %attribute %number "state_filter",