From 37c11b39b41b594db7f5103a15f625341eea30c0 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Wed, 6 Mar 2024 21:37:48 +0100
Subject: [PATCH] managesieve: managesieve-settings - Remove useless mail_debug
 setting

---
 src/managesieve/managesieve-client.c   | 2 +-
 src/managesieve/managesieve-settings.c | 2 --
 src/managesieve/managesieve-settings.h | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/managesieve/managesieve-client.c b/src/managesieve/managesieve-client.c
index ec7b8de16..8676a8b51 100644
--- a/src/managesieve/managesieve-client.c
+++ b/src/managesieve/managesieve-client.c
@@ -127,7 +127,7 @@ int client_create(int fd_in, int fd_out, const char *session_id,
 	svenv.flags = SIEVE_FLAG_HOME_RELATIVE;
 
 	if (sieve_init(&svenv, &managesieve_sieve_callbacks, user,
-		       set->mail_debug, &svinst) < 0) {
+		       user->set->mail_debug, &svinst) < 0) {
 		*error_r = "Failed to initialize Sieve interpreter";
 		return -1;
 	}
diff --git a/src/managesieve/managesieve-settings.c b/src/managesieve/managesieve-settings.c
index f1b732aa8..818c56614 100644
--- a/src/managesieve/managesieve-settings.c
+++ b/src/managesieve/managesieve-settings.c
@@ -56,7 +56,6 @@ const struct setting_keyvalue managesieve_settings_service_settings_defaults[] =
 	SETTING_DEFINE_STRUCT_##type(#name, name, struct managesieve_settings)
 
 static struct setting_define managesieve_setting_defines[] = {
-	DEF(BOOL, mail_debug),
 	DEF(BOOL, verbose_proctitle),
 	DEF(STR, rawlog_dir),
 
@@ -70,7 +69,6 @@ static struct setting_define managesieve_setting_defines[] = {
 };
 
 static struct managesieve_settings managesieve_default_settings = {
-	.mail_debug = FALSE,
 	.verbose_proctitle = FALSE,
 	.rawlog_dir = "",
 
diff --git a/src/managesieve/managesieve-settings.h b/src/managesieve/managesieve-settings.h
index b00905af9..976e18e3e 100644
--- a/src/managesieve/managesieve-settings.h
+++ b/src/managesieve/managesieve-settings.h
@@ -11,7 +11,6 @@ enum managesieve_client_workarounds {
 
 struct managesieve_settings {
 	pool_t pool;
-	bool mail_debug;
 	bool verbose_proctitle;
 	const char *rawlog_dir;
 
-- 
GitLab