]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-master: Add MASTER_SERVICE_FLAG_HAVE_STARTTLS
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Mon, 20 Apr 2020 15:01:21 +0000 (18:01 +0300)
committeraki.tuomi <aki.tuomi@open-xchange.com>
Fri, 24 Apr 2020 08:51:37 +0000 (08:51 +0000)
src/lib-master/master-service.c
src/lib-master/master-service.h

index 1a7785dd43e6235420bbd8acad1e14b9d8ce7ca7..d7b1f4c6293e64041bc06a86fcd63e3c61c75ed3 100644 (file)
@@ -192,7 +192,8 @@ static void master_service_init_socket_listeners(struct master_service *service)
                }
        }
        service->want_ssl_settings = have_ssl_sockets ||
-               (service->flags & MASTER_SERVICE_FLAG_USE_SSL_SETTINGS) != 0;
+               (service->flags & (MASTER_SERVICE_FLAG_USE_SSL_SETTINGS |
+                                  MASTER_SERVICE_FLAG_HAVE_STARTTLS)) != 0;
 }
 
 struct master_service *
index 5f3aa066c0ef43004f8c186e7b31d6e2852a68ec..acbeaf4504d508f765b6dd1464dd9d4a0183a6e5 100644 (file)
@@ -38,7 +38,10 @@ enum master_service_flags {
           initialization doesn't unnecessarily use up memory in data stack. */
        MASTER_SERVICE_FLAG_NO_INIT_DATASTACK_FRAME = 0x800,
        /* Don't connect at startup to the stats process. */
-       MASTER_SERVICE_FLAG_DONT_SEND_STATS     = 0x1000
+       MASTER_SERVICE_FLAG_DONT_SEND_STATS     = 0x1000,
+       /* Service supports STARTTLS-like feature. SSL server must be
+          initialized even if there are no ssl=yes listeners. */
+       MASTER_SERVICE_FLAG_HAVE_STARTTLS       = 0x2000,
 };
 
 struct master_service_connection_proxy {