global: Don't zero SSL settings unnecessarily

mail_user_init_ssl_client_settings() and mail_user_init_fs_settings()
will clear them again anyway.

diff --git a/src/doveadm/doveadm-settings.c b/src/doveadm/doveadm-settings.c
index 2c13bf0cf14a8a2301bdd8f0bd1d7cea98a9eb0d..54d6631a9da57ca2aa23a01d22242d23492c8541 100644 (file)
--- a/src/doveadm/doveadm-settings.c
+++ b/src/doveadm/doveadm-settings.c
@@ -212,7 +212,6 @@ const struct master_service_ssl_settings *doveadm_ssl_set = NULL;
 
 void doveadm_get_ssl_settings(struct ssl_iostream_settings *set_r, pool_t pool)
 {
-       i_zero(set_r);
        master_service_ssl_client_settings_to_iostream_set(doveadm_ssl_set,
                                                           pool, set_r);
 }

diff --git a/src/lib-lda/mail-send.c b/src/lib-lda/mail-send.c
index 806784f38e68df8079bcef0f201196a1f515c21e..e2614c3e43f7e3fb40dd846e7f5d6af30b465672 100644 (file)
--- a/src/lib-lda/mail-send.c
+++ b/src/lib-lda/mail-send.c
@@ -95,7 +95,6 @@ int mail_send_rejection(struct mail_deliver_context *ctx,
 
        vtable = get_var_expand_table(mail, recipient, reason);
 
-       i_zero(&ssl_set);
        mail_user_init_ssl_client_settings(user, &ssl_set);
 
        i_zero(&smtp_input);

diff --git a/src/lib-storage/mailbox-list.c b/src/lib-storage/mailbox-list.c
index a474f6a139d5cb5e42cb2015ff89f9effaae8572..e2840d3d12571dbea4cd5f8fa1d0850b4cdeb3c4 100644 (file)
--- a/src/lib-storage/mailbox-list.c
+++ b/src/lib-storage/mailbox-list.c
@@ -2054,7 +2054,6 @@ int mailbox_list_init_fs(struct mailbox_list *list, struct event *event_parent,
        struct mailbox_list_fs_context *ctx;
        struct fs *parent_fs;
 
-       i_zero(&ssl_set);
        i_zero(&fs_set);
        mail_user_init_fs_settings(list->ns->user, &fs_set, &ssl_set);
        /* fs_set.event_parent points to user->event by default */

diff --git a/src/lmtp/lmtp-proxy.c b/src/lmtp/lmtp-proxy.c
index d7d416f9306e3103a461768cc6165f277728f652..7977fa1ca4ecf85d4ab0785111310da5c133a81f 100644 (file)
--- a/src/lmtp/lmtp-proxy.c
+++ b/src/lmtp/lmtp-proxy.c
@@ -189,11 +189,12 @@ lmtp_proxy_connection_init_ssl(struct lmtp_proxy_connection *conn,
 {
        const struct master_service_ssl_settings *master_ssl_set;
 
-       i_zero(ssl_set_r);
        *ssl_mode_r = SMTP_CLIENT_SSL_MODE_NONE;
 
-       if ((conn->set.ssl_flags & PROXY_SSL_FLAG_YES) == 0)
+       if ((conn->set.ssl_flags & PROXY_SSL_FLAG_YES) == 0) {
+               i_zero(ssl_set_r);
                return;
+       }
 
        master_ssl_set = master_service_ssl_settings_get(master_service);
        master_service_ssl_client_settings_to_iostream_set(

diff --git a/src/plugins/fts-solr/fts-backend-solr-old.c b/src/plugins/fts-solr/fts-backend-solr-old.c
index 7d6fe4dae6ab64898dbb86419cb845c3a9bbaf56..20b891bc5931a7f2601fac2d123fd353eacbe5b9 100644 (file)
--- a/src/plugins/fts-solr/fts-backend-solr-old.c
+++ b/src/plugins/fts-solr/fts-backend-solr-old.c
@@ -253,9 +253,7 @@ fts_backend_solr_init(struct fts_backend *_backend, const char **error_r)
                return -1;
        }
 
-       i_zero(&ssl_set);
        mail_user_init_ssl_client_settings(_backend->ns->user, &ssl_set);
-
        if (solr_connection_init(&fuser->set, &ssl_set,
                                 _backend->ns->user->event,
                                 &backend->solr_conn, error_r) < 0)

diff --git a/src/plugins/fts-solr/fts-backend-solr.c b/src/plugins/fts-solr/fts-backend-solr.c
index bfc82b6c67c5c6f68b34f07bcccd18fbc3428236..0ac0f18e7aa17a6980d4b4c2a178539066147e17 100644 (file)
--- a/src/plugins/fts-solr/fts-backend-solr.c
+++ b/src/plugins/fts-solr/fts-backend-solr.c
@@ -193,9 +193,7 @@ fts_backend_solr_init(struct fts_backend *_backend, const char **error_r)
                _backend->flags |= FTS_BACKEND_FLAG_TOKENIZED_INPUT;
        }
 
-       i_zero(&ssl_set);
        mail_user_init_ssl_client_settings(_backend->ns->user, &ssl_set);
-
        return solr_connection_init(&fuser->set, &ssl_set,
                                    _backend->ns->user->event,
                                    &backend->solr_conn, error_r);

diff --git a/src/plugins/fts/fts-parser-tika.c b/src/plugins/fts/fts-parser-tika.c
index 81f5a02e1d852dadb26adf486ea40e2397ff6ed1..bb6379cbd5c25265e4487eaef3ef3b51c58ec395 100644 (file)
--- a/src/plugins/fts/fts-parser-tika.c
+++ b/src/plugins/fts/fts-parser-tika.c
@@ -64,7 +64,6 @@ tika_get_http_client_url(struct mail_user *user, struct http_url **http_url_r)
        }
 
        if (tika_http_client == NULL) {
-               i_zero(&ssl_set);
                mail_user_init_ssl_client_settings(user, &ssl_set);
 
                i_zero(&http_set);

diff --git a/src/plugins/push-notification/push-notification-driver-ox.c b/src/plugins/push-notification/push-notification-driver-ox.c
index 8d8e2bb0fc23866e26132b1a80a3628a3eec52cb..728cce9afdfafed16b7f3cebd72d12082c23b10c 100644 (file)
--- a/src/plugins/push-notification/push-notification-driver-ox.c
+++ b/src/plugins/push-notification/push-notification-driver-ox.c
@@ -73,7 +73,6 @@ push_notification_driver_ox_init_global(
                http_set.max_attempts = config->http_max_retries+1;
                http_set.request_timeout_msecs = config->http_timeout_msecs;
                http_set.event_parent = user->event;
-               i_zero(&ssl_set);
                mail_user_init_ssl_client_settings(user, &ssl_set);
                http_set.ssl = &ssl_set;
 

diff --git a/src/stats/event-exporter-transport-http-post.c b/src/stats/event-exporter-transport-http-post.c
index dd3809a95a56d070245361893f16b601f9082ebc..6d328cdfb6c20b0787c0026b63e0461e1fd276f3 100644 (file)
--- a/src/stats/event-exporter-transport-http-post.c
+++ b/src/stats/event-exporter-transport-http-post.c
@@ -52,16 +52,16 @@ void event_export_transport_http_post(const struct exporter *exporter,
                const struct master_service_ssl_settings *master_ssl_set =
                        master_service_ssl_settings_get(master_service);
                struct ssl_iostream_settings ssl_set;
-               i_zero(&ssl_set);
+
+               struct http_client_settings set = {
+                       .dns_client_socket_path = "dns-client",
+               };
                if (master_ssl_set != NULL) {
                        master_service_ssl_client_settings_to_iostream_set(
                                master_ssl_set, pool_datastack_create(),
                                &ssl_set);
+                       set.ssl = &ssl_set;
                }
-               const struct http_client_settings set = {
-                       .dns_client_socket_path = "dns-client",
-                       .ssl = &ssl_set,
-               };
                exporter_http_client = http_client_init(&set);
        }
 

diff --git a/src/submission/submission-backend-relay.c b/src/submission/submission-backend-relay.c
index d22bee3f286b304bf904e333670f2558b61405d9..b29ec080e5990ca9450a5d032a59975a22f7a26f 100644 (file)
--- a/src/submission/submission-backend-relay.c
+++ b/src/submission/submission-backend-relay.c
@@ -1057,7 +1057,6 @@ submission_backend_relay_create(
        submission_backend_init(&backend->backend, pool, client,
                                &backend_relay_vfuncs);
 
-       i_zero(&ssl_set);
        mail_user_init_ssl_client_settings(user, &ssl_set);
        if (set->ssl_verify)
                ssl_set.verbose_invalid_cert = TRUE;