From: Michael Friedrich Date: Wed, 9 Aug 2017 14:30:01 +0000 (+0200) Subject: Fix config validation for DB IDO categories 'DbCatEverything' X-Git-Tag: v2.7.1~36 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b3a65d9288f28509c68dd076b36e9c9387db372;p=icinga2 Fix config validation for DB IDO categories 'DbCatEverything' refs #5238 refs #5483 --- diff --git a/lib/db_ido/dbconnection.cpp b/lib/db_ido/dbconnection.cpp index 9e847dc20..95b14486d 100644 --- a/lib/db_ido/dbconnection.cpp +++ b/lib/db_ido/dbconnection.cpp @@ -459,7 +459,7 @@ void DbConnection::ValidateCategories(const Array::Ptr& value, const ValidationU int filter = FilterArrayToInt(value, DbQuery::GetCategoryFilterMap(), 0); - if (filter == -1 || (filter & ~(DbCatInvalid | DbCatEverything | DbCatConfig | DbCatState | + if (filter != DbCatEverything && (filter & ~(DbCatInvalid | DbCatEverything | DbCatConfig | DbCatState | DbCatAcknowledgement | DbCatComment | DbCatDowntime | DbCatEventHandler | DbCatExternalCommand | DbCatFlapping | DbCatLog | DbCatNotification | DbCatProgramStatus | DbCatRetention | DbCatStateHistory)) != 0)