Expire plugin: Include expire/ in the dictionary path.

--HG--
branch : HEAD

diff --git a/src/plugins/expire/expire-env.h b/src/plugins/expire/expire-env.h
index 021eeee9bc733ae6c4238297dae6aa2564821d22..3f2ad28aa8e11a912c281a295258f8a3f5cec5f7 100644 (file)
--- a/src/plugins/expire/expire-env.h
+++ b/src/plugins/expire/expire-env.h
@@ -1,6 +1,8 @@
 #ifndef EXPIRE_ENV_H
 #define EXPIRE_ENV_H
 
+#define DICT_EXPIRE_PREFIX DICT_PATH_SHARED"expire/"
+
 struct expire_env;
 
 struct expire_env *expire_env_init(const char *expunges, const char *altmoves);

diff --git a/src/plugins/expire/expire-plugin.c b/src/plugins/expire/expire-plugin.c
index ac27a791e5ebdb25f964e0dc360430d2778f2273..3610c29f909ddba01ce7d39972a1764d8db52158 100644 (file)
--- a/src/plugins/expire/expire-plugin.c
+++ b/src/plugins/expire/expire-plugin.c
@@ -122,7 +122,7 @@ expire_mailbox_transaction_commit(struct mailbox_transaction_context *t,
        if (xt->first_expunged || xt->saves) T_BEGIN {
                const char *key, *value;
 
-               key = t_strconcat(DICT_PATH_SHARED, expire.username, "/",
+               key = t_strconcat(DICT_EXPIRE_PREFIX, expire.username, "/",
                                  mailbox_name, NULL);
                if (!xt->first_expunged && xt->saves) {
                        /* saved new mails. dict needs to be updated only if

diff --git a/src/plugins/expire/expire-tool.c b/src/plugins/expire/expire-tool.c
index e8d5829dc845fdf5e2ad0f9e17ff000a052b1bb0..c8211f8ee9efc33e558fbdbb00c46a0e8aa16415 100644 (file)
--- a/src/plugins/expire/expire-tool.c
+++ b/src/plugins/expire/expire-tool.c
@@ -208,14 +208,14 @@ static void expire_run(bool testrun)
                i_fatal("dict_init() failed");
 
        trans = dict_transaction_begin(dict);
-       iter = dict_iterate_init(dict, DICT_PATH_SHARED,
+       iter = dict_iterate_init(dict, DICT_EXPIRE_PREFIX,
                                 DICT_ITERATE_FLAG_RECURSE |
                                 DICT_ITERATE_FLAG_SORT_BY_VALUE);
 
        /* We'll get the oldest values (timestamps) first */
        while (dict_iterate(iter, &key, &value) > 0) {
-               /* key = DICT_PATH_SHARED<user>/<mailbox> */
-               userp = key + strlen(DICT_PATH_SHARED);
+               /* key = DICT_EXPIRE_PREFIX<user>/<mailbox> */
+               userp = key + strlen(DICT_EXPIRE_PREFIX);
 
                p = strchr(userp, '/');
                if (p == NULL) {