dbox maildir migration: Support empty POP3 UIDL = base filename.

--HG--
branch : HEAD

diff --git a/src/lib-storage/index/dbox/dbox-file-maildir.c b/src/lib-storage/index/dbox/dbox-file-maildir.c
index d157d3ea46b21ab768a1144d85168b83f608579d..f2ceb6832badf07614189ac85ca00c865d2d87e6 100644 (file)
--- a/src/lib-storage/index/dbox/dbox-file-maildir.c
+++ b/src/lib-storage/index/dbox/dbox-file-maildir.c
@@ -111,6 +111,14 @@ const char *dbox_file_maildir_metadata_get(struct dbox_file *file,
                break;
        case DBOX_METADATA_POP3_UIDL:
                value = dbox_file_maildir_get_old_metadata(file, 'P');
+               if (value != NULL && *value == '\0') {
+                       /* special case: use base filename */
+                       p = strchr(file->fname, MAILDIR_INFO_SEP);
+                       if (p == NULL)
+                               value = file->fname;
+                       else
+                               value = t_strdup_until(file->fname, p);
+               }
                break;
        case DBOX_METADATA_EXPUNGED:
        case DBOX_METADATA_EXT_REF: