Mercurial > dovecot > original-hg > dovecot-1.2
changeset 5943:6c3c54dc67fc HEAD
Allow using --exec-mail imap/pop3 even if imap/pop3 isn't in protocols
setting.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Wed, 11 Jul 2007 01:41:49 +0300 |
| parents | bf536b8dbc51 |
| children | 760f910004d9 |
| files | src/master/master-settings.c |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/master/master-settings.c Tue Jul 10 22:29:21 2007 +0300 +++ b/src/master/master-settings.c Wed Jul 11 01:41:49 2007 +0300 @@ -1423,7 +1423,9 @@ i_error("No protocols given in configuration file"); return FALSE; } - if (!settings_is_active(server->imap)) { + /* --exec-mail is used if nochecks=TRUE. Allow it regardless + of what's in protocols setting. */ + if (!settings_is_active(server->imap) && !nochecks) { if (strcmp(server->imap->protocols, "none") == 0) { if (!settings_fix(server->imap, nochecks, nofixes)) @@ -1437,7 +1439,7 @@ server->defaults = server->imap; } - if (!settings_is_active(server->pop3)) + if (!settings_is_active(server->pop3) && !nochecks) server->pop3 = NULL; else { if (!settings_fix(server->pop3, nochecks, nofixes))