From 852f7bf1f9f15edafb227ca8edcb1477d3321203 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Thu, 5 Nov 2009 15:47:24 +0100
Subject: [PATCH] Fixed v2.0-specific settings-related bugs remaining in the
port from v1.2.
---
src/lib-sieve/plugins/include/ext-include-common.c | 2 +-
src/testsuite/Makefile.am | 4 +---
src/testsuite/testsuite-script.c | 1 -
src/testsuite/testsuite-settings.c | 4 ++--
src/testsuite/testsuite-settings.h | 2 +-
src/testsuite/testsuite.c | 3 +--
6 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/lib-sieve/plugins/include/ext-include-common.c b/src/lib-sieve/plugins/include/ext-include-common.c
index de16f8b81..b6be0f0d1 100644
--- a/src/lib-sieve/plugins/include/ext-include-common.c
+++ b/src/lib-sieve/plugins/include/ext-include-common.c
@@ -98,7 +98,7 @@ const char *ext_include_get_script_directory
break;
case EXT_INCLUDE_LOCATION_GLOBAL:
- sieve_dir = sieve_get_setting(svinst, "global_dir");
+ sieve_dir = sieve_get_setting(svinst, "sieve_global_dir");
if (sieve_dir == NULL) {
sieve_sys_error(
diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am
index 740d0a72b..fb8c9f550 100644
--- a/src/testsuite/Makefile.am
+++ b/src/testsuite/Makefile.am
@@ -56,7 +56,6 @@ testsuite_SOURCES = \
testsuite-smtp.c \
testsuite-mailstore.c \
testsuite-binary.c \
- testsuite-settings.c \
$(commands) \
$(tests) \
ext-testsuite.c \
@@ -74,6 +73,5 @@ noinst_HEADERS = \
testsuite-result.h \
testsuite-smtp.h \
testsuite-mailstore.h \
- testsuite-binary.h \
- testsuite-settings.h
+ testsuite-binary.h
diff --git a/src/testsuite/testsuite-script.c b/src/testsuite/testsuite-script.c
index 6bcb05c02..aead20354 100644
--- a/src/testsuite/testsuite-script.c
+++ b/src/testsuite/testsuite-script.c
@@ -5,7 +5,6 @@
#include "sieve.h"
#include "sieve-common.h"
-#include "sieve-settings.h"
#include "sieve-script.h"
#include "sieve-binary.h"
#include "sieve-interpreter.h"
diff --git a/src/testsuite/testsuite-settings.c b/src/testsuite/testsuite-settings.c
index a038529f1..3b1171cee 100644
--- a/src/testsuite/testsuite-settings.c
+++ b/src/testsuite/testsuite-settings.c
@@ -4,7 +4,6 @@
#include "strfuncs.h"
#include "sieve-common.h"
-#include "sieve-settings.h"
#include "testsuite-common.h"
#include "testsuite-settings.h"
@@ -42,7 +41,8 @@ void testsuite_settings_deinit(void)
hash_table_destroy(&settings);
}
-const char *testsuite_setting_get(const char *identifier)
+const char *testsuite_setting_get
+(void *context ATTR_UNUSED, const char *identifier)
{
struct testsuite_setting *setting = (struct testsuite_setting *)
hash_table_lookup(settings, identifier);
diff --git a/src/testsuite/testsuite-settings.h b/src/testsuite/testsuite-settings.h
index 69e31c453..730ce8e3e 100644
--- a/src/testsuite/testsuite-settings.h
+++ b/src/testsuite/testsuite-settings.h
@@ -6,7 +6,7 @@
void testsuite_settings_init(void);
void testsuite_settings_deinit(void);
-const char *testsuite_setting_get(const char *identifier);
+const char *testsuite_setting_get(void *context, const char *identifier);
void testsuite_setting_set(const char *identifier, const char *value);
#endif /* __TESTSUITE_SETTINGS_H */
diff --git a/src/testsuite/testsuite.c b/src/testsuite/testsuite.c
index 8b820cd60..3c6a4ee2e 100644
--- a/src/testsuite/testsuite.c
+++ b/src/testsuite/testsuite.c
@@ -14,7 +14,6 @@
#include "mail-storage-service.h"
#include "sieve.h"
-#include "sieve-settings.h"
#include "sieve-extensions.h"
#include "sieve-script.h"
#include "sieve-binary.h"
@@ -59,7 +58,7 @@ static void testsuite_tool_init(const char *extensions)
{
testsuite_settings_init();
- sieve_tool_init(&testsuite_sieve_callbacks);
+ sieve_tool_init(&testsuite_sieve_callbacks, FALSE);
sieve_extensions_set_string(sieve_instance, extensions);
--
GitLab