dovecot-2.0: master: inet_listener {port=0} and unix/fifo_listen...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/476de3a45cf8
changeset: 10599:476de3a45cf8
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Jan 28 22:04:44 2010 +0200
description:
master: inet_listener {port=0} and unix/fifo_listener {mode=0} now disables it.

diffstat:

1 file changed, 15 insertions(+)
src/master/service.c |   15 +++++++++++++++

diffs (39 lines):

diff -r db89ece5a19d -r 476de3a45cf8 src/master/service.c
--- a/src/master/service.c	Thu Jan 28 21:50:06 2010 +0200
+++ b/src/master/service.c	Thu Jan 28 22:04:44 2010 +0200
@@ -132,6 +132,11 @@ service_create_inet_listeners(struct ser
 	const char *const *tmp, *addresses;
 	bool ssl_disabled = strcmp(service->set->master_set->ssl, "no") == 0;
 
+	if (set->port == 0) {
+		/* disabled */
+		return 0;
+	}
+
 	if (*set->address != '\0')
 		addresses = set->address;
 	else {
@@ -278,6 +283,11 @@ service_create(pool_t pool, const struct
 		     unix_count + fifo_count + inet_count);
 		     
 	for (i = 0; i < unix_count; i++) {
+		if (unix_listeners[i]->mode == 0) {
+			/* disabled */
+			continue;
+		}
+
 		l = service_create_file_listener(service, SERVICE_LISTENER_UNIX,
 						 unix_listeners[i], error_r);
 		if (l == NULL)
@@ -285,6 +295,11 @@ service_create(pool_t pool, const struct
 		array_append(&service->listeners, &l, 1);
 	}
 	for (i = 0; i < fifo_count; i++) {
+		if (unix_listeners[i]->mode == 0) {
+			/* disabled */
+			continue;
+		}
+
 		l = service_create_file_listener(service, SERVICE_LISTENER_UNIX,
 						 fifo_listeners[i], error_r);
 		if (l == NULL)