From 1748e01b8883c871b907df0db1064ffae71ea8bc Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Fri, 10 Mar 2017 21:36:13 +0100
Subject: [PATCH] imapsieve plugin: Don't open the user's personal script
storage if no personal script is configured.
---
src/plugins/imapsieve/imap-sieve.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/imapsieve/imap-sieve.c b/src/plugins/imapsieve/imap-sieve.c
index 44c932bc8..ae383b905 100644
--- a/src/plugins/imapsieve/imap-sieve.c
+++ b/src/plugins/imapsieve/imap-sieve.c
@@ -302,7 +302,8 @@ int imap_sieve_run_init(struct imap_sieve *isieve,
/* Get storage for user script */
storage = NULL;
- if ((ret=imap_sieve_get_storage(isieve, &storage)) < 0)
+ if (script_name != NULL && *script_name != '\0' &&
+ (ret=imap_sieve_get_storage(isieve, &storage)) < 0)
return ret;
/* Open all scripts */
@@ -325,8 +326,7 @@ int imap_sieve_run_init(struct imap_sieve *isieve,
/* The user script */
user_script = NULL;
- if (storage != NULL && script_name != NULL &&
- *script_name != '\0') {
+ if (storage != NULL) {
i_assert(count < max_len);
scripts[count].script = sieve_storage_open_script
(storage, script_name, &error);
--
GitLab