Mercurial > dovecot > core-2.2
changeset 12908:4242a7bf8918
autocreate: Disable plugin when running from dsync.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Thu, 24 Mar 2011 00:14:58 +0200 |
| parents | 84354efc93bd |
| children | 8c409049402c |
| files | src/plugins/autocreate/Makefile.am src/plugins/autocreate/autocreate-plugin.c |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/plugins/autocreate/Makefile.am Thu Mar 24 00:10:59 2011 +0200 +++ b/src/plugins/autocreate/Makefile.am Thu Mar 24 00:14:58 2011 +0200 @@ -1,6 +1,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/lib-mail \ + -I$(top_srcdir)/src/lib-master \ -I$(top_srcdir)/src/lib-imap \ -I$(top_srcdir)/src/lib-storage
--- a/src/plugins/autocreate/autocreate-plugin.c Thu Mar 24 00:10:59 2011 +0200 +++ b/src/plugins/autocreate/autocreate-plugin.c Thu Mar 24 00:14:58 2011 +0200 @@ -1,6 +1,7 @@ /* Copyright (c) 2007-2011 Dovecot authors, see the included COPYING file */ #include "lib.h" +#include "master-service.h" #include "mail-storage.h" #include "mail-storage-hooks.h" #include "mail-namespace.h" @@ -98,6 +99,12 @@ static void autocreate_mail_namespaces_created(struct mail_namespace *namespaces) { + if (strcmp(master_service_get_name(master_service), "dsync") == 0) { + /* kludge: disable autocreate plugin for dsync, + since it'll only make things worse. this is fixed more + nicely in v2.1 code. */ + return; + } autocreate_mailboxes(namespaces); autosubscribe_mailboxes(namespaces); }