From 8b9cf5792db0c6d36df8aadb465f4403d31f7605 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Wed, 5 Sep 2018 21:27:58 +0200
Subject: [PATCH] lib-sieve: Adjust to changes in Dovecot regarding the
 postmaster_address setting.

---
 src/lib-sieve/sieve.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/lib-sieve/sieve.c b/src/lib-sieve/sieve.c
index 1657ad9e5..356448993 100644
--- a/src/lib-sieve/sieve.c
+++ b/src/lib-sieve/sieve.c
@@ -546,13 +546,10 @@ int sieve_test
 int sieve_script_env_init(struct sieve_script_env *senv,
 	struct mail_user *user, const char **error_r)
 {
-	const struct mail_storage_settings *mail_set =
-		mail_user_set_get_storage_set(user);
 	const struct message_address *postmaster;
 	const char *error;
 
-	if ( !mail_storage_get_postmaster_address(mail_set,
-		&postmaster, &error) ) {
+	if (!mail_user_get_postmaster_address(user, &postmaster, &error)) {
 		*error_r = t_strdup_printf(
 			"Invalid postmaster_address: %s", error);
 		return -1;