lib-master, global: Remove unnecessary MASTER_SERVICE_FLAG_USE_SSL_SETTINGS

SSL client settings are now always read.

diff --git a/src/auth/main.c b/src/auth/main.c
index 485b71d870ceaffd9bfecbff92db3d1277ee24e2..5f09fca5caba2c2d3d7869f4fbaf850298a0d4fe 100644 (file)
--- a/src/auth/main.c
+++ b/src/auth/main.c
@@ -370,7 +370,6 @@ int main(int argc, char *argv[])
 {
        int c;
        enum master_service_flags service_flags =
-               MASTER_SERVICE_FLAG_USE_SSL_SETTINGS |
                MASTER_SERVICE_FLAG_NO_SSL_INIT;
 
        master_service = master_service_init("auth", service_flags, &argc, &argv, "w");

diff --git a/src/doveadm/doveadm.c b/src/doveadm/doveadm.c
index aaad48ff4160843bfde03a8b139ad83727c484f0..e123007dcaa9abce71e3112e2adce065b8c7fb75 100644 (file)
--- a/src/doveadm/doveadm.c
+++ b/src/doveadm/doveadm.c
@@ -260,7 +260,6 @@ int main(int argc, char *argv[])
        enum master_service_flags service_flags =
                MASTER_SERVICE_FLAG_STANDALONE |
                MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN |
-               MASTER_SERVICE_FLAG_USE_SSL_SETTINGS |
                MASTER_SERVICE_FLAG_NO_SSL_INIT |
                MASTER_SERVICE_FLAG_NO_INIT_DATASTACK_FRAME;
        struct doveadm_cmd_context cctx;

diff --git a/src/doveadm/main.c b/src/doveadm/main.c
index b5641f1056bf14b9aab3e0219a67e40d6530047e..9635b8891d4aa876dc99bba27ad83a6329b0f305 100644 (file)
--- a/src/doveadm/main.c
+++ b/src/doveadm/main.c
@@ -99,8 +99,7 @@ int main(int argc, char *argv[])
 {
        enum master_service_flags service_flags =
                MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN |
-               MASTER_SERVICE_FLAG_HAVE_STARTTLS |
-               MASTER_SERVICE_FLAG_USE_SSL_SETTINGS;
+               MASTER_SERVICE_FLAG_HAVE_STARTTLS;
        int c;
 
        master_service = master_service_init("doveadm", service_flags,

diff --git a/src/lib-master/master-service.h b/src/lib-master/master-service.h
index 61ec6eb3c0c7b95f518c0bd5a39c937a669711c0..1138f24b50cca9fe6eea02caa9b89101aaff50ee 100644 (file)
--- a/src/lib-master/master-service.h
+++ b/src/lib-master/master-service.h
@@ -27,11 +27,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,
-       /* Always read SSL settings into memory, even if there are no ssl
-          listeners or _HAVE_STARTTLS flag hasn't been set. This is mainly
-          intended to be used when SSL client settings are wanted to be
-          accessed via lib-master. */
-       MASTER_SERVICE_FLAG_USE_SSL_SETTINGS    = 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/lmtp/main.c b/src/lmtp/main.c
index d72f70a62626c52a357623990cb7d63f9f8070ed..6a72d55a6abe66f8f9056e7e18eaa3872a032356 100644 (file)
--- a/src/lmtp/main.c
+++ b/src/lmtp/main.c
@@ -121,7 +121,6 @@ int main(int argc, char *argv[])
                NULL
        };
        enum master_service_flags service_flags =
-               MASTER_SERVICE_FLAG_USE_SSL_SETTINGS |
                MASTER_SERVICE_FLAG_HAVE_STARTTLS;
        enum mail_storage_service_flags storage_service_flags =
                MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP |

diff --git a/src/login-common/main.c b/src/login-common/main.c
index 006166d0b428af4181664931e03bb3ccb5e4ba9f..d5622d9cfabea40704ef093932e65d65a48a576c 100644 (file)
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -512,7 +512,6 @@ int login_binary_run(struct login_binary *binary,
        enum master_service_flags service_flags =
                MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN |
                MASTER_SERVICE_FLAG_TRACK_LOGIN_STATE |
-               MASTER_SERVICE_FLAG_USE_SSL_SETTINGS |
                MASTER_SERVICE_FLAG_HAVE_STARTTLS |
                MASTER_SERVICE_FLAG_NO_SSL_INIT;
        pool_t set_pool;

diff --git a/src/stats/main.c b/src/stats/main.c
index 0d1fd947ca3ab309966972d37b3123e019e548e6..15e07338fa8e25f6e33f788430a342657e90a07b 100644 (file)
--- a/src/stats/main.c
+++ b/src/stats/main.c
@@ -90,7 +90,6 @@ int main(int argc, char *argv[])
                NULL
        };
        const enum master_service_flags service_flags =
-               MASTER_SERVICE_FLAG_USE_SSL_SETTINGS |
                MASTER_SERVICE_FLAG_NO_SSL_INIT |
                MASTER_SERVICE_FLAG_DONT_SEND_STATS |
                MASTER_SERVICE_FLAG_NO_IDLE_DIE |