From: Charles E. Lehner <cel@celehner.com>
Date: Tue, 22 Sep 2020 18:58:28 +0000 (-0400)
Subject: Allow Sieve config without userid without warning
X-Git-Tag: 3.17.7~5
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f6e93a313d205dd675df4692ea25fee4d6f5a729

Allow Sieve config without userid without warning
---

diff --git a/src/plugins/managesieve/sieve_prefs.c b/src/plugins/managesieve/sieve_prefs.c
index a398cfc61..2e2d0e9b8 100644
--- a/src/plugins/managesieve/sieve_prefs.c
+++ b/src/plugins/managesieve/sieve_prefs.c
@@ -526,8 +526,9 @@ struct SieveAccountConfig *sieve_prefs_account_get_config(
 			 * to read the 10th element in order not to break older
 			 * configurations, and to move the password to password
 			 * store.
-			 * If there are not 10 nor 9 elements, something is wrong. */
-		if (num != 9) {
+			 * The userid may be missing if it is unset.
+			 * If there are not 10, 9 or 8 elements, something is wrong. */
+		if (num != 9 && num != 8) {
 			g_warning("failed reading Sieve config elements");
 		}
 	}