From 3451298df420408dff76cf0e46fbb7dca5bd9145 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Sat, 3 Jul 2010 16:27:33 +0200
Subject: [PATCH] ManageSieve: forgot to include settings in doveconf plugin.
---
src/managesieve-login/Makefile.am | 2 ++
src/managesieve-login/managesieve-login-settings-plugin.c | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/managesieve-login/Makefile.am b/src/managesieve-login/Makefile.am
index 777cfb0fe..84652eace 100644
--- a/src/managesieve-login/Makefile.am
+++ b/src/managesieve-login/Makefile.am
@@ -15,7 +15,9 @@ settings_LTLIBRARIES = \
libmanagesieve_login_settings.la
libmanagesieve_login_settings_la_SOURCES = \
+ managesieve-login-settings.c \
managesieve-login-settings-plugin.c
+
libmanagesieve_login_settings_la_CFLAGS = \
$(AM_CFLAGS) $(LIBDOVECOT_CONFIG_INCLUDE) -DPKG_LIBEXECDIR=\""$(dovecot_pkglibexecdir)"\"
diff --git a/src/managesieve-login/managesieve-login-settings-plugin.c b/src/managesieve-login/managesieve-login-settings-plugin.c
index d0037c846..8cff0d78c 100644
--- a/src/managesieve-login/managesieve-login-settings-plugin.c
+++ b/src/managesieve-login/managesieve-login-settings-plugin.c
@@ -28,7 +28,7 @@ static void managesieve_login_config_parser_begin(struct config_parser_context *
void managesieve_login_settings_init(struct module *module ATTR_UNUSED)
{
next_hook_config_parser_begin = hook_config_parser_begin;
- //hook_config_parser_begin = managesieve_login_config_parser_begin;
+ hook_config_parser_begin = managesieve_login_config_parser_begin;
}
void managesieve_login_settings_deinit(void)
@@ -196,9 +196,11 @@ static void managesieve_login_config_parser_begin(struct config_parser_context *
}
}
+/* Currently fails and makes doveconf go berserk
+
if ( capability_sieve != NULL )
managesieve_login_config_set(ctx, "managesieve_sieve_capability", capability_sieve);
if ( capability_notify != NULL )
- managesieve_login_config_set(ctx, "managesieve_notify_capability", capability_notify);
+ managesieve_login_config_set(ctx, "managesieve_notify_capability", capability_notify);*/
}
--
GitLab