From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Fri, 20 Jan 2023 03:15:19 +0000 (+0200)
Subject: lib-storage: Remove explicit check for missing mail_home in plugin setting expansion
X-Git-Tag: 2.4.0~2273
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caf397a18205c9c11375da23e4212f0287f285d1;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Remove explicit check for missing mail_home in plugin setting expansion

The %{home} expansion will now fail clearly even without this check.
---

diff --git a/src/lib-storage/mail-user.c b/src/lib-storage/mail-user.c
index b663fc528a..1e27bd812f 100644
--- a/src/lib-storage/mail-user.c
+++ b/src/lib-storage/mail-user.c
@@ -99,7 +99,7 @@ static void
 mail_user_expand_plugins_envs(struct mail_user *user,
 			      struct mail_storage_settings *set)
 {
-	const char **envs, *home, *error;
+	const char **envs, *error;
 	string_t *str;
 	unsigned int i, count;
 
@@ -110,15 +110,6 @@ mail_user_expand_plugins_envs(struct mail_user *user,
 	envs = array_get_modifiable(&set->plugin_envs, &count);
 	i_assert((count % 2) == 0);
 	for (i = 0; i < count; i += 2) {
-		if (user->_home == NULL &&
-		    var_has_key(envs[i+1], 'h', "home") &&
-		    mail_user_get_home(user, &home) <= 0) {
-			user->error = p_strdup_printf(user->pool,
-				"userdb didn't return a home directory, "
-				"but plugin setting %s used it (%%h): %s",
-				envs[i], envs[i+1]);
-			return;
-		}
 		str_truncate(str, 0);
 		if (var_expand_with_funcs(str, envs[i+1],
 					  mail_user_var_expand_table(user),