dovecot-2.0-sslstream: master: Don't check if service's executab...

dovecot at dovecot.org dovecot at dovecot.org
Sat Feb 13 03:00:55 EET 2010


details:   http://hg.dovecot.org/dovecot-2.0-sslstream/rev/488530ada460
changeset: 10670:488530ada460
user:      Timo Sirainen <tss at iki.fi>
date:      Sun Feb 07 19:13:55 2010 +0200
description:
master: Don't check if service's executable exists if there are no listeners.

diffstat:

1 file changed, 7 insertions(+), 6 deletions(-)
src/master/service.c |   13 +++++++------

diffs (30 lines):

diff -r 8d931f94fdf6 -r 488530ada460 src/master/service.c
--- a/src/master/service.c	Sun Feb 07 19:13:19 2010 +0200
+++ b/src/master/service.c	Sun Feb 07 19:13:55 2010 +0200
@@ -236,12 +236,6 @@ service_create(pool_t pool, const struct
 			p_strconcat(pool, set->master_set->libexec_dir, "/",
 				    set->executable, NULL);
 	}
-	if (access(t_strcut(service->executable, ' '), X_OK) < 0) {
-		*error_r = t_strdup_printf("access(%s) failed: %m",
-					   t_strcut(service->executable, ' '));
-		return NULL;
-	}
-
 	/* set these later, so if something fails we don't have to worry about
 	   closing them */
 	service->log_fd[0] = -1;
@@ -313,6 +307,13 @@ service_create(pool_t pool, const struct
 			return NULL;
 	}
 
+	if (array_count(&service->listeners) > 0) {
+		if (access(t_strcut(service->executable, ' '), X_OK) < 0) {
+			*error_r = t_strdup_printf("access(%s) failed: %m",
+				t_strcut(service->executable, ' '));
+			return NULL;
+		}
+	}
 	return service;
 }
 


More information about the dovecot-cvs mailing list