From: Timo Sirainen Date: Mon, 20 Apr 2020 15:01:21 +0000 (+0300) Subject: lib-master: Add MASTER_SERVICE_FLAG_HAVE_STARTTLS X-Git-Tag: 2.3.11.2~199 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0025846f14ead4a2bdff8ad0f988c9189946af90;p=thirdparty%2Fdovecot%2Fcore.git lib-master: Add MASTER_SERVICE_FLAG_HAVE_STARTTLS --- diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c index 1a7785dd43..d7b1f4c629 100644 --- a/src/lib-master/master-service.c +++ b/src/lib-master/master-service.c @@ -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 * diff --git a/src/lib-master/master-service.h b/src/lib-master/master-service.h index 5f3aa066c0..acbeaf4504 100644 --- a/src/lib-master/master-service.h +++ b/src/lib-master/master-service.h @@ -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 {