[dovecot-cvs] dovecot/src/master master-settings.c, 1.125.2.12, 1.125.2.13
cras at dovecot.org
cras at dovecot.org
Thu Aug 10 22:15:45 EEST 2006
Update of /var/lib/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv11261
Modified Files:
Tag: branch_1_0
master-settings.c
Log Message:
Allow empty protocols line when using --exec-mail.
Index: master-settings.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.125.2.12
retrieving revision 1.125.2.13
diff -u -d -r1.125.2.12 -r1.125.2.13
--- master-settings.c 10 Aug 2006 18:52:38 -0000 1.125.2.12
+++ master-settings.c 10 Aug 2006 19:15:42 -0000 1.125.2.13
@@ -539,6 +539,11 @@
static bool settings_is_active(struct settings *set)
{
+ if (*set->protocols == '\0') {
+ /* we're probably using this with --exec-mail */
+ return TRUE;
+ }
+
if (set->protocol == MAIL_PROTOCOL_IMAP) {
if (strstr(set->protocols, "imap") == NULL)
return FALSE;
@@ -1389,6 +1394,8 @@
}
}
+ i_assert(ctx.root != NULL);
+
/* settings ok, swap them */
temp = settings_pool;
settings_pool = settings2_pool;
More information about the dovecot-cvs
mailing list