From: Timo Sirainen Date: Mon, 9 Jan 2023 16:49:58 +0000 (+0200) Subject: lib-master, master: Remove MASTER_SERVICE_FLAG_DISABLE_SSL_SET X-Git-Tag: 2.4.0~3065 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95235d00fe18ad2533a6ba780a6a653cbcc5ca6f;p=thirdparty%2Fdovecot%2Fcore.git lib-master, master: Remove MASTER_SERVICE_FLAG_DISABLE_SSL_SET This is no longer necessary now that settings are passed via fd. --- diff --git a/src/lib-master/master-service.h b/src/lib-master/master-service.h index a6e1b6f825..4d94bd1244 100644 --- a/src/lib-master/master-service.h +++ b/src/lib-master/master-service.h @@ -30,12 +30,6 @@ enum master_service_flags { /* Show number of connections in process title (only if verbose_proctitle setting is enabled) */ MASTER_SERVICE_FLAG_UPDATE_PROCTITLE = 0x100, - /* Don't read any SSL settings. This is mainly needed to prevent master - process from trying to pass through huge list of SSL CA certificates - through environment for ssl_ca setting, which could fail. Although - the same problem can still happen with standalone doveadm if it - reads settings via doveconf instead of config socket. */ - MASTER_SERVICE_FLAG_DISABLE_SSL_SET = 0x200, /* Don't initialize SSL context automatically. */ MASTER_SERVICE_FLAG_NO_SSL_INIT = 0x400, /* Don't create a data stack frame between master_service_init() and diff --git a/src/master/main.c b/src/master/main.c index 37f1f9eb3f..0cfd1734c6 100644 --- a/src/master/main.c +++ b/src/master/main.c @@ -809,8 +809,7 @@ int main(int argc, char *argv[]) MASTER_SERVICE_FLAG_STANDALONE | MASTER_SERVICE_FLAG_DONT_SEND_STATS | MASTER_SERVICE_FLAG_DONT_LOG_TO_STDERR | - MASTER_SERVICE_FLAG_NO_INIT_DATASTACK_FRAME | - MASTER_SERVICE_FLAG_DISABLE_SSL_SET, + MASTER_SERVICE_FLAG_NO_INIT_DATASTACK_FRAME, &argc, &argv, "+Fanp"); i_unset_failure_prefix();