From 34431d7a67474c00d5b0554f5d45b867509f4a7a Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 12 Dec 2022 00:12:49 +0200
Subject: [PATCH] global: Adjust to settings API changes
---
src/lib-sieve-tool/sieve-tool.c | 4 +---
.../managesieve-login-settings-plugin.c | 12 ------------
src/managesieve/main.c | 10 ++--------
src/managesieve/managesieve-capabilities.c | 1 -
4 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/src/lib-sieve-tool/sieve-tool.c b/src/lib-sieve-tool/sieve-tool.c
index c91189372..9cab10c7e 100644
--- a/src/lib-sieve-tool/sieve-tool.c
+++ b/src/lib-sieve-tool/sieve-tool.c
@@ -137,8 +137,7 @@ sieve_tool_init(const char *name, int *argc, char **argv[],
enum master_service_flags service_flags =
MASTER_SERVICE_FLAG_STANDALONE |
MASTER_SERVICE_FLAG_DONT_SEND_STATS |
- MASTER_SERVICE_FLAG_NO_INIT_DATASTACK_FRAME |
- MASTER_SERVICE_FLAG_DISABLE_SSL_SET;
+ MASTER_SERVICE_FLAG_NO_INIT_DATASTACK_FRAME;
if (no_config)
service_flags |= MASTER_SERVICE_FLAG_NO_CONFIG_SETTINGS;
@@ -255,7 +254,6 @@ sieve_tool_init_finish(struct sieve_tool *tool, bool init_mailstore,
MAIL_STORAGE_SERVICE_FLAG_NO_NAMESPACES;
i_zero(&service_input);
- service_input.module = "mail";
service_input.service = tool->name;
service_input.username = username;
diff --git a/src/managesieve-login/managesieve-login-settings-plugin.c b/src/managesieve-login/managesieve-login-settings-plugin.c
index 7d22e7321..0a46a7b13 100644
--- a/src/managesieve-login/managesieve-login-settings-plugin.c
+++ b/src/managesieve-login/managesieve-login-settings-plugin.c
@@ -205,18 +205,6 @@ static void managesieve_login_config_set
static void managesieve_login_config_parser_begin(struct config_parser_context *ctx)
{
- const char *const *module = ctx->modules;
-
- if ( module != NULL && *module != NULL ) {
- while ( *module != NULL ) {
- if ( strcmp(*module, "managesieve-login") == 0 )
- break;
- module++;
- }
- if ( *module == NULL )
- return;
- }
-
if ( !capability_dumped ) {
(void)capability_dump();
capability_dumped = TRUE;
diff --git a/src/managesieve/main.c b/src/managesieve/main.c
index 2d964cf12..19d3f0666 100644
--- a/src/managesieve/main.c
+++ b/src/managesieve/main.c
@@ -200,7 +200,6 @@ static void main_stdio_run(const char *username)
buffer_t *input_buf;
i_zero(&input);
- input.module = "managesieve";
input.service = "sieve";
input.username = username != NULL ? username : getenv("USER");
if (input.username == NULL && IS_STANDALONE())
@@ -232,7 +231,6 @@ login_request_finished(const struct login_server_request *request,
buffer_t input_buf;
i_zero(&input);
- input.module = "managesieve";
input.service = "sieve";
input.local_ip = request->auth_req.local_ip;
input.remote_ip = request->auth_req.remote_ip;
@@ -328,13 +326,9 @@ int main(int argc, char *argv[])
if (IS_STANDALONE() || getenv("DUMP_CAPABILITY") != NULL) {
service_flags |= MASTER_SERVICE_FLAG_STANDALONE |
MASTER_SERVICE_FLAG_STD_CLIENT;
- } else {
- service_flags |= MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN;
- }
- if (getenv("DUMP_CAPABILITY") != NULL) {
- service_flags |= MASTER_SERVICE_FLAG_DONT_SEND_STATS |
- MASTER_SERVICE_FLAG_DISABLE_SSL_SET;
}
+ if (getenv("DUMP_CAPABILITY") != NULL)
+ service_flags |= MASTER_SERVICE_FLAG_DONT_SEND_STATS;
master_service = master_service_init("managesieve", service_flags,
&argc, &argv, "t:u:");
diff --git a/src/managesieve/managesieve-capabilities.c b/src/managesieve/managesieve-capabilities.c
index 66feec5a4..68ddf0f05 100644
--- a/src/managesieve/managesieve-capabilities.c
+++ b/src/managesieve/managesieve-capabilities.c
@@ -8,7 +8,6 @@
#include "settings-parser.h"
#include "master-service.h"
#include "master-service-settings.h"
-#include "master-service-settings-cache.h"
#include "sieve.h"
--
GitLab