dovecot-2.2: pop3-migration: If UIDLs can't be set, fail unless ...
dovecot at dovecot.org
dovecot at dovecot.org
Tue Feb 4 18:22:57 EET 2014
details: http://hg.dovecot.org/dovecot-2.2/rev/1c298212ab70
changeset: 17124:1c298212ab70
user: Timo Sirainen <tss at iki.fi>
date: Mon Feb 03 10:53:59 2014 -0500
description:
pop3-migration: If UIDLs can't be set, fail unless pop3_migration_ignore_missing_uidls=yes.
diffstat:
src/plugins/pop3-migration/pop3-migration-plugin.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diffs (35 lines):
diff -r 3839e4e62413 -r 1c298212ab70 src/plugins/pop3-migration/pop3-migration-plugin.c
--- a/src/plugins/pop3-migration/pop3-migration-plugin.c Mon Feb 03 10:49:03 2014 -0500
+++ b/src/plugins/pop3-migration/pop3-migration-plugin.c Mon Feb 03 10:53:59 2014 -0500
@@ -48,6 +48,7 @@
unsigned int all_mailboxes:1;
unsigned int pop3_all_hdr_sha1_set:1;
+ unsigned int ignore_missing_uidls:1;
};
struct pop3_migration_mailbox {
@@ -501,6 +502,13 @@
missing_uids_count++;
}
if (missing_uids_count > 0 && !mstorage->all_mailboxes) {
+ if (!mstorage->ignore_missing_uidls) {
+ i_error("pop3_migration: %u POP3 messages have no "
+ "matching IMAP messages (set "
+ "pop3_migration_ignore_missing_uidls=yes "
+ "to continue anyway)", missing_uids_count);
+ return -1;
+ }
i_warning("pop3_migration: %u POP3 messages have no "
"matching IMAP messages", missing_uids_count);
}
@@ -670,6 +678,9 @@
mstorage->all_mailboxes =
mail_user_plugin_getenv(storage->user,
"pop3_migration_all_mailboxes") != NULL;
+ mstorage->ignore_missing_uidls =
+ mail_user_plugin_getenv(storage->user,
+ "pop3_migration_ignore_missing_uidls") != NULL;
MODULE_CONTEXT_SET(storage, pop3_migration_storage_module, mstorage);
}
More information about the dovecot-cvs
mailing list