dovecot-2.2-pigeonhole: lib-sieve: file storage: Erroneously alw...
pigeonhole at rename-it.nl
pigeonhole at rename-it.nl
Thu Jul 24 13:21:36 UTC 2014
details: http://hg.rename-it.nl/dovecot-2.2-pigeonhole/rev/3b32e606f69d
changeset: 1891:3b32e606f69d
user: Stephan Bosch <stephan at rename-it.nl>
date: Thu Jul 24 15:21:29 2014 +0200
description:
lib-sieve: file storage: Erroneously always ignored active script setting.
diffstat:
src/lib-sieve/sieve-storage.c | 4 ++--
src/lib-sieve/storage/file/sieve-file-storage.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diffs (40 lines):
diff -r 2a489c1fdaee -r 3b32e606f69d src/lib-sieve/sieve-storage.c
--- a/src/lib-sieve/sieve-storage.c Thu Jul 24 15:20:47 2014 +0200
+++ b/src/lib-sieve/sieve-storage.c Thu Jul 24 15:21:29 2014 +0200
@@ -394,7 +394,7 @@
set_sieve_dir = sieve_setting_get(svinst, "sieve_dir");
if ( set_sieve_dir == NULL )
set_sieve_dir = sieve_setting_get(svinst, "sieve_storage");
-
+
if ( set_sieve_dir == NULL || *set_sieve_dir == '\0' ) {
storage_path = "";
} else {
@@ -422,7 +422,7 @@
}
storage = sieve_file_storage_init_legacy
- (svinst, data, storage_path, flags, error_r);
+ (svinst, set_sieve, storage_path, flags, error_r);
}
if ( storage == NULL )
diff -r 2a489c1fdaee -r 3b32e606f69d src/lib-sieve/storage/file/sieve-file-storage.c
--- a/src/lib-sieve/storage/file/sieve-file-storage.c Thu Jul 24 15:20:47 2014 +0200
+++ b/src/lib-sieve/storage/file/sieve-file-storage.c Thu Jul 24 15:21:29 2014 +0200
@@ -238,6 +238,7 @@
static int sieve_file_storage_init_paths
(struct sieve_file_storage *fstorage, const char *active_path,
const char *storage_path, enum sieve_error *error_r)
+ ATTR_NULL(2, 3)
{
struct sieve_storage *storage = &fstorage->storage;
struct sieve_instance *svinst = storage->svinst;
@@ -251,7 +252,6 @@
/* Active script path */
- active_path = NULL;
if ( storage->main_storage ||
(storage->flags & SIEVE_STORAGE_FLAG_READWRITE) != 0 ) {
if ( active_path == NULL || *active_path == '\0' ) {
More information about the dovecot-cvs
mailing list