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 6700339f56fab547c2ae0957e04f5b252ed03661..06d5a40e9f61ac751d95aa5c6f69f729346fac21 100644 (file)
--- 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 aa4a41f9c9b4bb861cb8b383808726c515d94a82..73720d2ad8667144f552a814fcbaf7f58ec7b725 100644 (file)
--- 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;