From: Timo Sirainen <tss@iki.fi>
Date: Mon, 8 Mar 2010 22:27:01 +0000 (+0200)
Subject: master: Don't complain about duplicate inet_listeners with port=0 (they're ignored).
X-Git-Tag: 2.0.beta4~95
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f2e7a51a96059ba2888d69113125ff2699f38323;p=thirdparty%2Fdovecot%2Fcore.git

master: Don't complain about duplicate inet_listeners with port=0 (they're ignored).

--HG--
branch : HEAD
---

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index 6700339f56..06d5a40e9f 100644
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -271,8 +271,10 @@ static void add_inet_listeners(ARRAY_TYPE(inet_listener_settings) *l,
 	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 --git a/src/master/service.c b/src/master/service.c
index aa4a41f9c9..73720d2ad8 100644
--- a/src/master/service.c
+++ b/src/master/service.c
@@ -101,6 +101,8 @@ service_create_one_inet_listener(struct service *service,
 {
 	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 @@ service_create_one_inet_listener(struct service *service,
 	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;