dovecot-2.1: doveconf: When looking up specific settings, ignore...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/892ab0a8ab9c
changeset: 14616:892ab0a8ab9c
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Jul 16 23:15:19 2012 +0300
description:
doveconf: When looking up specific settings, ignore errors found by check functions.

diffstat:

 src/config/doveconf.c |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r 30b0d6b1c581 -r 892ab0a8ab9c src/config/doveconf.c
--- a/src/config/doveconf.c	Mon Jul 16 18:00:21 2012 +0300
+++ b/src/config/doveconf.c	Mon Jul 16 23:15:19 2012 +0300
@@ -451,7 +451,7 @@
 	unsigned int len;
 	bool dump_section = FALSE;
 
-	ctx = config_dump_human_init("", scope, TRUE);
+	ctx = config_dump_human_init("", scope, FALSE);
 	config_export_by_filter(ctx->export_ctx, filter);
 	if (config_export_finish(&ctx->export_ctx) < 0)
 		return -1;
@@ -693,6 +693,11 @@
 		ret2 = config_export_finish(&ctx);
 	} else if (setting_name_filters != NULL) {
 		ret2 = 0;
+		/* ignore settings-check failures in configuration. this allows
+		   using doveconf to lookup settings for things like install or
+		   uninstall scripts where the configuration might
+		   (temporarily) not be fully usable */
+		ret = 0;
 		for (i = 0; setting_name_filters[i] != NULL; i++) {
 			if (config_dump_one(&filter, hide_key, scope,
 					    setting_name_filters[i]) < 0)