From: Timo Sirainen Date: Tue, 20 Jun 2023 19:28:35 +0000 (+0300) Subject: dbox: mail_temp_scan_interval - Fix deleted temp file prefix X-Git-Tag: 2.4.0~2681 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f719582126624543d673443121e8070df153fbd;p=thirdparty%2Fdovecot%2Fcore.git dbox: mail_temp_scan_interval - Fix deleted temp file prefix dbox files are always created with DBOX_TEMP_FILE_PREFIX, not the mailbox list-specific prefix. This was a problem only if dbox was used with LAYOUT=Maildir++, which nobody was likely to do. Other layouts had identical temp file prefixes to DBOX_TEMP_FILE_PREFIX. --- diff --git a/src/lib-storage/index/dbox-common/dbox-storage.c b/src/lib-storage/index/dbox-common/dbox-storage.c index be95ea1f14..67290d4544 100644 --- a/src/lib-storage/index/dbox-common/dbox-storage.c +++ b/src/lib-storage/index/dbox-common/dbox-storage.c @@ -226,8 +226,8 @@ dbox_cleanup_temp_files(struct mailbox_list *list, const char *path, return stated; } - const char *prefix = mailbox_list_get_global_temp_prefix(list); - (void)unlink_old_files(path, prefix, ioloop_time - DBOX_TMP_DELETE_SECS); + (void)unlink_old_files(path, DBOX_TEMP_FILE_PREFIX, + ioloop_time - DBOX_TMP_DELETE_SECS); return TRUE; }