dovecot-1.0: Allow using --exec-mail imap/pop3 even if imap/pop3...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.0/rev/c1d0acf68614
changeset: 5340:c1d0acf68614
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Jul 11 01:41:51 2007 +0300
description:
Allow using --exec-mail imap/pop3 even if imap/pop3 isn't in protocols
setting.

diffstat:

1 file changed, 4 insertions(+), 2 deletions(-)
src/master/master-settings.c |    6 ++++--

diffs (23 lines):

diff -r 90ea01bfaf82 -r c1d0acf68614 src/master/master-settings.c
--- a/src/master/master-settings.c	Tue Jul 10 20:20:40 2007 +0300
+++ b/src/master/master-settings.c	Wed Jul 11 01:41:51 2007 +0300
@@ -1366,7 +1366,9 @@ bool master_settings_read(const char *pa
 			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))
@@ -1380,7 +1382,7 @@ bool master_settings_read(const char *pa
 			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))