From: Timo Sirainen <tss@iki.fi>
Date: Fri, 19 Mar 2010 18:40:23 +0000 (+0200)
Subject: doveconf: Added -x parameter to expand $variables and <file in output.
X-Git-Tag: 2.0.beta4~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8077be0cb40eef95d97cf92dc813b4011ef9ec69;p=thirdparty%2Fdovecot%2Fcore.git

doveconf: Added -x parameter to expand $variables and <file in output.

--HG--
branch : HEAD
---

diff --git a/src/config/doveconf.c b/src/config/doveconf.c
index a90f3f4787..87c786d931 100644
--- a/src/config/doveconf.c
+++ b/src/config/doveconf.c
@@ -465,12 +465,12 @@ int main(int argc, char *argv[])
 	const char *error;
 	char **exec_args = NULL;
 	int c, ret, ret2;
-	bool config_path_specified;
+	bool config_path_specified, expand_vars = FALSE;
 
 	memset(&filter, 0, sizeof(filter));
 	master_service = master_service_init("config",
 					     MASTER_SERVICE_FLAG_STANDALONE,
-					     &argc, &argv, "af:m:nNe");
+					     &argc, &argv, "af:m:nNex");
 	orig_config_path = master_service_get_config_path(master_service);
 
 	i_set_failure_prefix("doveconf: ");
@@ -492,6 +492,9 @@ int main(int argc, char *argv[])
 		case 'N':
 			scope = CONFIG_DUMP_SCOPE_SET;
 			break;
+		case 'x':
+			expand_vars = TRUE;
+			break;
 		default:
 			return FATAL_DEFAULT;
 		}
@@ -514,7 +517,7 @@ int main(int argc, char *argv[])
 	master_service_init_finish(master_service);
 	config_parse_load_modules();
 
-	if ((ret = config_parse_file(config_path, FALSE, &error)) == 0 &&
+	if ((ret = config_parse_file(config_path, expand_vars, &error)) == 0 &&
 	    access(EXAMPLE_CONFIG_DIR, X_OK) == 0) {
 		i_fatal("%s (copy example configs from "EXAMPLE_CONFIG_DIR"/)",
 			error);