Blame SOURCES/cyrus-imapd-load-tombstones-for-cleanup.patch

ae2f5c
diff --git a/imap/cyr_expire.c b/imap/cyr_expire.c
ae2f5c
index bcb40ea..747414a 100644
ae2f5c
--- a/imap/cyr_expire.c
ae2f5c
+++ b/imap/cyr_expire.c
ae2f5c
@@ -628,9 +628,10 @@ int main(int argc, char *argv[])
ae2f5c
         }
ae2f5c
 
ae2f5c
         if (do_user)
ae2f5c
-            mboxlist_usermboxtree(do_user, expire, &erock, MBOXTREE_DELETED);
ae2f5c
+            mboxlist_usermboxtree(do_user, expire, &erock, MBOXTREE_DELETED|MBOXTREE_TOMBSTONES);
ae2f5c
         else
ae2f5c
-            mboxlist_allmbox(find_prefix, expire, &erock, 0);
ae2f5c
+            mboxlist_allmbox(find_prefix, expire, &erock,
ae2f5c
+                             MBOXTREE_TOMBSTONES);
ae2f5c
 
ae2f5c
         syslog(LOG_NOTICE, "Expired %lu and expunged %lu out of %lu "
ae2f5c
                             "messages from %lu mailboxes",