From 249742c51e8d8322614556041d1b7bfe60e1e8ca Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Wed, 22 Jun 2011 22:17:28 +0200
Subject: [PATCH] Sieve tools: started using mail_namespaces_init_location
instead of mail_namespaces_init_empty.
---
src/lib-sieve-tool/sieve-tool.c | 16 ++++------------
src/sieve-tools/sieve-test.c | 2 +-
src/testsuite/testsuite.c | 6 +-----
3 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/src/lib-sieve-tool/sieve-tool.c b/src/lib-sieve-tool/sieve-tool.c
index c1b60a3b8..0139567d6 100644
--- a/src/lib-sieve-tool/sieve-tool.c
+++ b/src/lib-sieve-tool/sieve-tool.c
@@ -337,10 +337,7 @@ void sieve_tool_init_mail_user
{
struct mail_user *mail_user_dovecot = tool->mail_user_dovecot;
const char *username = tool->username;
- struct mail_namespace_settings ns_set;
struct mail_namespace *ns = NULL;
- enum mail_storage_flags storage_flags =
- MAIL_STORAGE_FLAG_NO_AUTOCREATE;
const char *home = NULL, *errstr = NULL;
tool->mail_user = mail_user_alloc
@@ -353,17 +350,12 @@ void sieve_tool_init_mail_user
if ( mail_user_init(tool->mail_user, &errstr) < 0 )
i_fatal("Test user initialization failed: %s", errstr);
- memset(&ns_set, 0, sizeof(ns_set));
- ns_set.location = mail_location;
- ns_set.inbox = TRUE;
- ns_set.subscriptions = TRUE;
+ if ( mail_namespaces_init_location
+ (tool->mail_user, mail_location, &errstr) < 0 )
+ i_fatal("Test storage creation failed: %s", errstr);
- ns = mail_namespaces_init_empty(tool->mail_user);
+ ns = tool->mail_user->namespaces;
ns->flags |= NAMESPACE_FLAG_NOQUOTA | NAMESPACE_FLAG_NOACL;
- ns->set = &ns_set;
-
- if ( mail_storage_create(ns, NULL, storage_flags, &errstr) < 0 )
- i_fatal("Test storage creation failed: %s", errstr);
}
struct mail *sieve_tool_open_file_as_mail
diff --git a/src/sieve-tools/sieve-test.c b/src/sieve-tools/sieve-test.c
index d36ae0e7d..3c9263c66 100644
--- a/src/sieve-tools/sieve-test.c
+++ b/src/sieve-tools/sieve-test.c
@@ -207,7 +207,7 @@ int main(int argc, char **argv)
}
/* Finish tool initialization */
- svinst = sieve_tool_init_finish(sieve_tool, TRUE);
+ svinst = sieve_tool_init_finish(sieve_tool, execute && mailloc == NULL);
/* Enable debug extension */
sieve_enable_debug_extension(svinst);
diff --git a/src/testsuite/testsuite.c b/src/testsuite/testsuite.c
index 210f5b643..966e430c5 100644
--- a/src/testsuite/testsuite.c
+++ b/src/testsuite/testsuite.c
@@ -136,12 +136,8 @@ int main(int argc, char **argv)
/* Initialize mail user */
sieve_tool_set_homedir(sieve_tool, t_abspath(""));
- /* Set dummy mail environment */
- env_put(t_strdup_printf("MAIL=maildir:/tmp/dovecot-test-%s",
- sieve_tool_get_username(sieve_tool)));
-
/* Finish tool initialization */
- svinst = sieve_tool_init_finish(sieve_tool, TRUE);
+ svinst = sieve_tool_init_finish(sieve_tool, FALSE);
testsuite_init(svinst, log_stdout);
testsuite_settings_init();
--
GitLab