lib-storage: Remove MAIL_STORAGE_SERVICE_FLAG_NO_SSL_CA and master_service_settings_i...

These flags no longer do anything.

diff --git a/src/imap/main.c b/src/imap/main.c
index 0dc22dc8f975abbbcaed9880a9046c98e7b26458..f0adb9439348eb365ab387a7e3374b271210943c 100644 (file)
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -478,7 +478,6 @@ int main(int argc, char *argv[])
        struct login_server_settings login_set;
        enum master_service_flags service_flags = 0;
        enum mail_storage_service_flags storage_service_flags =
-               MAIL_STORAGE_SERVICE_FLAG_NO_SSL_CA |
                /*
                 * We include MAIL_STORAGE_SERVICE_FLAG_NO_NAMESPACES so
                 * that the mail_user initialization is fast and we can

diff --git a/src/lib-master/master-service-settings.h b/src/lib-master/master-service-settings.h
index 75d32e8dd1cb03e645556f171e7abdc06fbac7b9..1b0c1c8c12d9adeb8dfb425a93c82916ed4cb6e5 100644 (file)
--- a/src/lib-master/master-service-settings.h
+++ b/src/lib-master/master-service-settings.h
@@ -51,11 +51,6 @@ struct master_service_settings_input {
        const char *username;
        struct ip_addr local_ip, remote_ip;
        const char *local_name;
-
-       /* A bit of a memory saving kludge: Mail processes (especially imap)
-          shouldn't read ssl_ca setting since it's likely not needed and it
-          can use a lot of memory. */
-       bool no_ssl_ca;
 };
 
 struct master_service_settings_output {

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 2355de5318b06dc46f66f8a976ba1e7fa4f270b2..0987618b1ffd0703c18bc4414e41630ededdfd9f 100644 (file)
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -1088,8 +1088,6 @@ int mail_storage_service_read_settings(struct mail_storage_service_ctx *ctx,
                (flags & MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP) == 0;
        set_input.use_sysexits =
                (flags & MAIL_STORAGE_SERVICE_FLAG_USE_SYSEXITS) != 0;
-       set_input.no_ssl_ca =
-               (flags & MAIL_STORAGE_SERVICE_FLAG_NO_SSL_CA) != 0;
 
        if (input != NULL) {
                set_input.module = input->module;

diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h
index a6c4ea615932a7ceb4aca9ee5274b0aee7bd7d73..1705dcb987d5d6490ea92c856a40a8f979c0f696 100644 (file)
--- a/src/lib-storage/mail-storage-service.h
+++ b/src/lib-storage/mail-storage-service.h
@@ -34,8 +34,6 @@ enum mail_storage_service_flags {
        MAIL_STORAGE_SERVICE_FLAG_USE_SYSEXITS          = 0x400,
        /* Don't create namespaces, only the user. */
        MAIL_STORAGE_SERVICE_FLAG_NO_NAMESPACES         = 0x800,
-       /* Disable reading ssl_ca setting to save memory. */
-       MAIL_STORAGE_SERVICE_FLAG_NO_SSL_CA             = 0x1000,
 };
 
 struct mail_storage_service_input {

diff --git a/src/pop3/main.c b/src/pop3/main.c
index 7366d9070ba866622155f52d4e312f996c44045f..cace1555b5b3028e091c1eb318c37b805c88a19f 100644 (file)
--- a/src/pop3/main.c
+++ b/src/pop3/main.c
@@ -363,8 +363,7 @@ int main(int argc, char *argv[])
        };
        struct login_server_settings login_set;
        enum master_service_flags service_flags = 0;
-       enum mail_storage_service_flags storage_service_flags =
-               MAIL_STORAGE_SERVICE_FLAG_NO_SSL_CA;
+       enum mail_storage_service_flags storage_service_flags = 0;
        const char *username = NULL, *auth_socket_path = "auth-master";
        int c;