From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Wed, 22 Jan 2020 12:34:15 +0000 (+0200)
Subject: config: Add support for $ENV:name
X-Git-Tag: 2.3.14.rc1~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=479223dc56e0fb65f3cc7088b37e22dd6b7da0b0;p=thirdparty%2Fdovecot%2Fcore.git

config: Add support for $ENV:name

Expands into given environment variable
---

diff --git a/src/config/config-parser.c b/src/config/config-parser.c
index aec5359edd..47d0f18fd2 100644
--- a/src/config/config-parser.c
+++ b/src/config/config-parser.c
@@ -821,6 +821,11 @@ static int config_write_keyvariable(struct config_parser_context *ctx,
 			str_append(str, var_name);
 		} else if (!ctx->expand_values && !expand_parent) {
 			str_append(str, var_name);
+		} else if (str_begins(var_name, "$ENV:")) {
+			/* use environment variable */
+			const char *envval = getenv(var_name+5);
+			if (envval != NULL)
+				str_append(str, envval);
 		} else {
 			const char *var_value;
 			enum setting_type var_type;