From 7ca485f63cd7828554869e372ad4ebf3581cce0c Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Tue, 30 May 2017 14:47:28 +0200 Subject: [PATCH] Improve validation for attributes which must not be 'null' --- lib/db_ido/dbconnection.ti | 2 +- lib/icinga/host.ti | 2 +- lib/icinga/service.ti | 2 +- lib/icinga/timeperiod.ti | 4 ++-- lib/icinga/user.ti | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/db_ido/dbconnection.ti b/lib/db_ido/dbconnection.ti index cf922bd79..61b92b8cc 100644 --- a/lib/db_ido/dbconnection.ti +++ b/lib/db_ido/dbconnection.ti @@ -31,7 +31,7 @@ abstract class DbConnection : ConfigObject default {{{ return "icinga_"; }}} }; - [config] Dictionary::Ptr cleanup { + [config, required] Dictionary::Ptr cleanup { default {{{ return new Dictionary(); }}} }; diff --git a/lib/icinga/host.ti b/lib/icinga/host.ti index ccf730322..fcc035868 100644 --- a/lib/icinga/host.ti +++ b/lib/icinga/host.ti @@ -32,7 +32,7 @@ class Host : Checkable load_after Endpoint; load_after Zone; - [config, no_user_modify] array(name(HostGroup)) groups { + [config, no_user_modify, required] array(name(HostGroup)) groups { default {{{ return new Array(); }}} }; diff --git a/lib/icinga/service.ti b/lib/icinga/service.ti index a97cf67bb..d0c3da685 100644 --- a/lib/icinga/service.ti +++ b/lib/icinga/service.ti @@ -44,7 +44,7 @@ class Service : Checkable < ServiceNameComposer load_after Host; load_after Zone; - [config, no_user_modify] array(name(ServiceGroup)) groups { + [config, no_user_modify, required] array(name(ServiceGroup)) groups { default {{{ return new Array(); }}} }; diff --git a/lib/icinga/timeperiod.ti b/lib/icinga/timeperiod.ti index b1087531a..4d289c28a 100644 --- a/lib/icinga/timeperiod.ti +++ b/lib/icinga/timeperiod.ti @@ -40,10 +40,10 @@ class TimePeriod : CustomVarObject [config] bool prefer_includes { default {{{ return true; }}} }; - [config] array(name(TimePeriod)) excludes { + [config, required] array(name(TimePeriod)) excludes { default {{{ return new Array(); }}} }; - [config] array(name(TimePeriod)) includes { + [config, required] array(name(TimePeriod)) includes { default {{{ return new Array(); }}} }; [state, no_user_modify] Value valid_begin; diff --git a/lib/icinga/user.ti b/lib/icinga/user.ti index 5fe86b672..5bf4d4124 100644 --- a/lib/icinga/user.ti +++ b/lib/icinga/user.ti @@ -36,7 +36,7 @@ class User : CustomVarObject return m_DisplayName; }}} }; - [config, no_user_modify] array(name(UserGroup)) groups { + [config, no_user_modify, required] array(name(UserGroup)) groups { default {{{ return new Array(); }}} }; [config, navigation] name(TimePeriod) period (PeriodRaw) { -- 2.40.0