dovecot-2.2: lib-storage: Mailbox deletion shouldn't fail when t...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/962ff5ebd807
changeset: 19134:962ff5ebd807
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Sep 08 18:45:57 2015 +0300
description:
lib-storage: Mailbox deletion shouldn't fail when trying to delete read-only attributes.

diffstat:

 src/lib-storage/index/index-storage.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 72d6f1f235d2 -r 962ff5ebd807 src/lib-storage/index/index-storage.c
--- a/src/lib-storage/index/index-storage.c	Tue Sep 08 18:45:28 2015 +0300
+++ b/src/lib-storage/index/index-storage.c	Tue Sep 08 18:45:57 2015 +0300
@@ -632,8 +632,12 @@
 			    strlen(MAILBOX_ATTRIBUTE_PREFIX_DOVECOT_PVT_SERVER)) == 0)
 			continue;
 
-		if (mailbox_attribute_unset(t, type, key) < 0)
-			ret = -1;
+		if (mailbox_attribute_unset(t, type, key) < 0) {
+			if (mailbox_get_last_mail_error(t->box) != MAIL_ERROR_NOTPOSSIBLE) {
+				ret = -1;
+				break;
+			}
+		}
 	}
 	if (mailbox_attribute_iter_deinit(&iter) < 0)
 		ret = -1;