From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Tue, 20 Aug 2024 06:29:09 +0000 (+0300)
Subject: lib-master: Use new var_expand
X-Git-Tag: 2.4.1~612
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71c90d93343481ab059147c3d972be1f70fc093c;p=thirdparty%2Fdovecot%2Fcore.git

lib-master: Use new var_expand
---

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index 84a6a4151c..b815861350 100644
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -26,7 +26,7 @@
 #include "master-service-ssl.h"
 #include "master-service-settings.h"
 #include "iostream-ssl.h"
-#include "var-expand.h"
+#include "var-expand-new.h"
 
 #include <getopt.h>
 #include <unistd.h>
@@ -1020,10 +1020,6 @@ static void master_service_import_environment_real(const char *import_environmen
 	const char *error;
 	string_t *expanded;
 
-	static const struct var_expand_table table[] = {
-		{ '\0', NULL, NULL },
-	};
-
 	if (*import_environment == '\0')
 		return;
 
@@ -1048,8 +1044,7 @@ static void master_service_import_environment_real(const char *import_environmen
 			key = *envs;
 		else {
 			key = t_strdup_until(*envs, value++);
-			if (var_expand_with_table(expanded, value, table,
-						  &error) <= 0)
+			if (var_expand_new(expanded, value, NULL, &error) < 0)
 				i_fatal("Cannot expand variable %s", value);
 			if (str_len(expanded) > 0) {
 				value = str_c(expanded);