dovecot-2.0: master: Don't complain about duplicate inet_listene...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/7c2e38d7390c
changeset: 10873:7c2e38d7390c
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Mar 09 00:27:01 2010 +0200
description:
master: Don't complain about duplicate inet_listeners with port=0 (they're ignored).

diffstat:

 src/master/master-settings.c |  6 ++++--
 src/master/service.c         |  6 ++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 3f9c7a8a92b9 -r 7c2e38d7390c src/master/master-settings.c
--- a/src/master/master-settings.c	Tue Mar 09 00:26:05 2010 +0200
+++ b/src/master/master-settings.c	Tue Mar 09 00:27:01 2010 +0200
@@ -271,8 +271,10 @@
 	array_foreach(l, sets) {
 		struct inet_listener_settings *set = *sets;
 
-		str = t_strdup_printf("%d:%s", set->port, set->address);
-		array_append(all_listeners, &str, 1);
+		if (set->port != 0) {
+			str = t_strdup_printf("%d:%s", set->port, set->address);
+			array_append(all_listeners, &str, 1);
+		}
 	}
 }
 
diff -r 3f9c7a8a92b9 -r 7c2e38d7390c src/master/service.c
--- a/src/master/service.c	Tue Mar 09 00:26:05 2010 +0200
+++ b/src/master/service.c	Tue Mar 09 00:27:01 2010 +0200
@@ -101,6 +101,8 @@
 {
 	struct service_listener *l;
 
+	i_assert(set->port != 0);
+
 	l = p_new(service->list->pool, struct service_listener, 1);
 	l->service = service;
 	l->type = SERVICE_LISTENER_INET;
@@ -111,10 +113,6 @@
 	if (resolve_ip(address, &l->set.inetset.ip, error_r) < 0)
 		return NULL;
 
-	if (set->port == 0) {
-		*error_r = "Port not given";
-		return NULL;
-	}
 	if (set->port > 65535) {
 		*error_r = t_strdup_printf("Invalid port: %u", set->port);
 		return NULL;