[icinga-checkins] icinga.org: icinga-core/next: Fix writing the objects.cache file

git at icinga.org git at icinga.org
Wed May 22 13:22:16 CEST 2013


Module: icinga-core
Branch: next
Commit: 144ee2b677cc0a7d54904bc5926aaabcfe04f595
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=144ee2b677cc0a7d54904bc5926aaabcfe04f595

Author: Christian Ruppert <idl0r at gentoo.org>
Date:   Sat May 11 17:42:29 2013 +0200

Fix writing the objects.cache file

A regression introduced in ae09a1a478f60484ed629d0b5e513763f67c00ae caused the
objects.cache to be written only when running in verify (-v) mode. The cache
file should be written when verify_config == FALSE.

Signed-off-by: Michael Friedrich <michael.friedrich at netways.de>

---

 base/config.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/base/config.c b/base/config.c
index ba2f116..f4ca0b1 100644
--- a/base/config.c
+++ b/base/config.c
@@ -252,7 +252,7 @@ int read_all_object_data(char *main_config_file) {
 	options = READ_ALL_OBJECT_DATA;
 
 	/* cache object definitions if we're up and running */
-	if (verify_config && test_scheduling == FALSE)
+	if (verify_config == FALSE && test_scheduling == FALSE)
 		cache = TRUE;
 
 	/* precache object definitions */





More information about the icinga-checkins mailing list