From e9e5969663f350d93a61627c5fa7c6828b0e9b96 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Sat, 17 Jun 2023 00:08:03 +0300
Subject: [PATCH] global: Remove explicit ssl setting handling
lib-ssl-iostream automatically pulls the settings now.
---
src/plugins/imap-filter-sieve/imap-filter-sieve.c | 2 --
src/plugins/imapsieve/imap-sieve.c | 3 ---
src/plugins/lda-sieve/lda-sieve-plugin.c | 3 ---
3 files changed, 8 deletions(-)
diff --git a/src/plugins/imap-filter-sieve/imap-filter-sieve.c b/src/plugins/imap-filter-sieve/imap-filter-sieve.c
index 32ccf5f90..a733daffc 100644
--- a/src/plugins/imap-filter-sieve/imap-filter-sieve.c
+++ b/src/plugins/imap-filter-sieve/imap-filter-sieve.c
@@ -9,7 +9,6 @@
#include "mail-user.h"
#include "mail-duplicate.h"
#include "mail-storage-private.h"
-#include "iostream-ssl.h"
#include "smtp-submit.h"
#include "sieve.h"
#include "sieve-storage.h"
@@ -570,7 +569,6 @@ imap_filter_sieve_smtp_start(const struct sieve_script_env *senv,
struct smtp_submit_input submit_input;
i_zero(&submit_input);
- submit_input.ssl = user->ssl_set;
return (void *)smtp_submit_init_simple(&submit_input, smtp_set,
mail_from);
diff --git a/src/plugins/imapsieve/imap-sieve.c b/src/plugins/imapsieve/imap-sieve.c
index 9b259dc90..dae91fcd0 100644
--- a/src/plugins/imapsieve/imap-sieve.c
+++ b/src/plugins/imapsieve/imap-sieve.c
@@ -9,7 +9,6 @@
#include "mail-storage.h"
#include "mail-user.h"
#include "mail-duplicate.h"
-#include "iostream-ssl.h"
#include "imap-client.h"
#include "imap-settings.h"
@@ -160,12 +159,10 @@ imap_sieve_smtp_start(const struct sieve_script_env *senv,
{
struct imap_sieve_context *isctx = senv->script_context;
struct imap_sieve *isieve = isctx->isieve;
- struct mail_user *user = isieve->client->user;
const struct smtp_submit_settings *smtp_set = isieve->client->smtp_set;
struct smtp_submit_input submit_input;
i_zero(&submit_input);
- submit_input.ssl = user->ssl_set;
return smtp_submit_init_simple(&submit_input, smtp_set, mail_from);
}
diff --git a/src/plugins/lda-sieve/lda-sieve-plugin.c b/src/plugins/lda-sieve/lda-sieve-plugin.c
index 1eb0a35c2..ea9f2dfab 100644
--- a/src/plugins/lda-sieve/lda-sieve-plugin.c
+++ b/src/plugins/lda-sieve/lda-sieve-plugin.c
@@ -15,7 +15,6 @@
#include "mail-duplicate.h"
#include "smtp-submit.h"
#include "mail-send.h"
-#include "iostream-ssl.h"
#include "lda-settings.h"
#include "sieve.h"
@@ -80,11 +79,9 @@ lda_sieve_smtp_start(const struct sieve_script_env *senv,
{
struct mail_deliver_context *dctx =
(struct mail_deliver_context *)senv->script_context;
- struct mail_user *user = dctx->rcpt_user;
struct smtp_submit_input submit_input;
i_zero(&submit_input);
- submit_input.ssl = user->ssl_set;
return (void *)smtp_submit_init_simple(&submit_input, dctx->smtp_set,
mail_from);
--
GitLab