dovecot-1.0: If protocols=none, don't check if mail/login execut...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.0/rev/822d66b19b04
changeset: 5494:822d66b19b04
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Dec 21 17:11:16 2007 +0200
description:
If protocols=none, don't check if mail/login executables are usable.

diffstat:

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

diffs (31 lines):

diff -r 2cedab21cd6d -r 822d66b19b04 src/master/master-settings.c
--- a/src/master/master-settings.c	Thu Dec 20 23:01:04 2007 +0200
+++ b/src/master/master-settings.c	Fri Dec 21 17:11:16 2007 +0200
@@ -637,7 +637,8 @@ static bool settings_verify(struct setti
 		return FALSE;
 	}
 
-	if (access(t_strcut(set->mail_executable, ' '), X_OK) < 0) {
+	if (set->protocol != MAIL_PROTOCOL_ANY &&
+	    access(t_strcut(set->mail_executable, ' '), X_OK) < 0) {
 		i_error("Can't use mail executable %s: %m",
 			t_strcut(set->mail_executable, ' '));
 		return FALSE;
@@ -714,7 +715,8 @@ static bool settings_verify(struct setti
 		return FALSE;
 	}
 
-	if (access(t_strcut(set->login_executable, ' '), X_OK) < 0) {
+	if (set->protocol != MAIL_PROTOCOL_ANY &&
+	    access(t_strcut(set->login_executable, ' '), X_OK) < 0) {
 		i_error("Can't use login executable %s: %m",
 			t_strcut(set->login_executable, ' '));
 		return FALSE;
@@ -1370,6 +1372,7 @@ bool master_settings_read(const char *pa
 		   of what's in protocols setting. */
 		if (!settings_is_active(server->imap) && !nochecks) {
 			if (strcmp(server->imap->protocols, "none") == 0) {
+				server->imap->protocol = MAIL_PROTOCOL_ANY;
 				if (!settings_fix(server->imap, nochecks,
 						  nofixes))
 					return FALSE;