From a220c81a84b6ccca6f5fb412a3ae4277e7aac219 Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Tue, 15 Oct 2024 23:23:52 +0200
Subject: [PATCH] lib-sieve: storage: file: Rename SIEVE_FILE_DEFAULT_PATH to
SIEVE_FILE_DEFAULT_ACTIVE_PATH
---
src/lib-sieve/storage/file/sieve-file-storage.c | 8 ++++----
src/lib-sieve/storage/file/sieve-file-storage.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib-sieve/storage/file/sieve-file-storage.c b/src/lib-sieve/storage/file/sieve-file-storage.c
index 6797060f3..3296bdeb7 100644
--- a/src/lib-sieve/storage/file/sieve-file-storage.c
+++ b/src/lib-sieve/storage/file/sieve-file-storage.c
@@ -566,8 +566,8 @@ sieve_file_storage_init_from_settings(
e_debug(storage->event,
"Active script path is unconfigured; "
"using default (path=%s)",
- SIEVE_FILE_DEFAULT_PATH);
- active_path = SIEVE_FILE_DEFAULT_PATH;
+ SIEVE_FILE_DEFAULT_ACTIVE_PATH);
+ active_path = SIEVE_FILE_DEFAULT_ACTIVE_PATH;
}
return sieve_file_storage_init_common(fstorage, active_path,
@@ -657,8 +657,8 @@ sieve_file_storage_do_init_default(struct sieve_file_storage *fstorage,
e_debug(storage->event,
"Active script path is unconfigured; "
"using default (path=%s)",
- SIEVE_FILE_DEFAULT_PATH);
- active_path = SIEVE_FILE_DEFAULT_PATH;
+ SIEVE_FILE_DEFAULT_ACTIVE_PATH);
+ active_path = SIEVE_FILE_DEFAULT_ACTIVE_PATH;
} else {
*error_code_r = storage->error_code;
*error_r = storage->error;
diff --git a/src/lib-sieve/storage/file/sieve-file-storage.h b/src/lib-sieve/storage/file/sieve-file-storage.h
index 405c19576..238061398 100644
--- a/src/lib-sieve/storage/file/sieve-file-storage.h
+++ b/src/lib-sieve/storage/file/sieve-file-storage.h
@@ -13,7 +13,7 @@
#define SIEVE_FILE_READ_BLOCK_SIZE (1024*8)
-#define SIEVE_FILE_DEFAULT_PATH "~/.dovecot."SIEVE_SCRIPT_FILEEXT
+#define SIEVE_FILE_DEFAULT_ACTIVE_PATH "~/.dovecot."SIEVE_SCRIPT_FILEEXT
/* How often to scan tmp/ directory for old files (based on dir's atime) */
#define SIEVE_FILE_STORAGE_TMP_SCAN_SECS (8*60*60)
--
GitLab