From 663f72300be279a1ed4feedf61e722ea1f1f74dd Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Mon, 10 Feb 2014 08:50:09 +0100 Subject: [PATCH] Fix validation for the "authorities" attribute. Fixes #5593 --- lib/config/base-type.conf | 4 ---- lib/icinga/icinga-type.conf | 12 ++++++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/config/base-type.conf b/lib/config/base-type.conf index 2c45cc72c..1bcef63c4 100644 --- a/lib/config/base-type.conf +++ b/lib/config/base-type.conf @@ -30,10 +30,6 @@ type DynamicObject { %attribute string "*" }, - %attribute array "authorities" { - %attribute name(Endpoint) "*" - }, - %attribute array "domains" { %attribute string "*" } diff --git a/lib/icinga/icinga-type.conf b/lib/icinga/icinga-type.conf index 4f909b133..b48e970cf 100644 --- a/lib/icinga/icinga-type.conf +++ b/lib/icinga/icinga-type.conf @@ -126,7 +126,11 @@ type Service { } }, - %attribute any "templates" + %attribute any "templates", + + %attribute array "authorities" { + %attribute name(Endpoint) "*" + }, } type ServiceGroup { @@ -165,7 +169,11 @@ type Notification { %attribute number "notification_type_filter", %attribute number "notification_state_filter", - %attribute any "templates" + %attribute any "templates", + + %attribute array "authorities" { + %attribute name(Endpoint) "*" + }, } type User {