master: If service { protocol } is set and not included in "protocols", ignore its...

diff --git a/src/master/master-settings.c b/src/master/master-settings.c
index aa8542ce36dbb5c34151184097c506be1f6f7681..748d5f0b0ef340cb6d6571ea4f8b500ff5868b1b 100644 (file)
--- a/src/master/master-settings.c
+++ b/src/master/master-settings.c
@@ -496,6 +496,13 @@ master_settings_verify(void *_set, pool_t pool, const char **error_r)
        for (i = 0; i < count; i++) {
                struct service_settings *service = services[i];
 
+               if (*service->protocol != '\0' &&
+                   !str_array_find((const char **)set->protocols_split,
+                                   service->protocol)) {
+                       /* protocol not enabled, ignore its settings */
+                       continue;
+               }
+
                if (*service->executable == '\0') {
                        *error_r = t_strdup_printf("service(%s): "
                                "executable is empty", service->name);
@@ -550,9 +557,7 @@ master_settings_verify(void *_set, pool_t pool, const char **error_r)
                }
 #endif
 
-               if (*service->protocol != '\0' &&
-                   str_array_find((const char **)set->protocols_split,
-                                  service->protocol)) {
+               if (*service->protocol != '\0') {
                        /* each imap/pop3/lmtp process can use up a connection,
                           although if service_count=1 it's only temporary */
                        if (service->service_count != 1 ||