[Commits] [SCM] claws branch, master, updated. 3.17.6-25-g2b4c50c98

[paul at claws-mail.org]

The branch, master has been updated
       via  2b4c50c9800fefb5f2f11491985dc215d7e34ead (commit)
       via  f6e93a313d205dd675df4692ea25fee4d6f5a729 (commit)
      from  34475d2091df71d344dca6b2c2a1bad3983869cc (commit)

Summary of changes:
 src/plugins/managesieve/sieve_prefs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 2b4c50c9800fefb5f2f11491985dc215d7e34ead
Merge: f6e93a313 34475d209
Author: Paul <paul at claws-mail.org>
Date:   Fri Sep 25 07:15:38 2020 +0100

    Merge branch 'master' of ssh+git://git.claws-mail.org/home/git/claws


commit f6e93a313d205dd675df4692ea25fee4d6f5a729
Author: Charles E. Lehner <cel at celehner.com>
Date:   Tue Sep 22 14:58:28 2020 -0400

    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");
 		}
 	}

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail