From d34a07d36865fa4438d6c6af8408376188343eb9 Mon Sep 17 00:00:00 2001 From: Baofeng Date: Mon, 18 Apr 2016 15:40:56 +0300 Subject: [PATCH] expire-plugin: code cleanup expire_mail_namespaces_created() will check dict_uri after namespace validation check. --- src/plugins/expire/expire-plugin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/expire/expire-plugin.c b/src/plugins/expire/expire-plugin.c index 6af2b9687b..4119154f1a 100644 --- a/src/plugins/expire/expire-plugin.c +++ b/src/plugins/expire/expire-plugin.c @@ -405,17 +405,17 @@ static void expire_mail_namespaces_created(struct mail_namespace *ns) struct dict *db; const char *dict_uri, *error; - dict_uri = mail_user_plugin_getenv(user, "expire_dict"); if (mail_user_plugin_getenv(user, "expire") == NULL) { if (user->mail_debug) i_debug("expire: No expire setting - plugin disabled"); return; } + + dict_uri = mail_user_plugin_getenv(user, "expire_dict"); if (dict_uri == NULL) { i_error("expire plugin: expire_dict setting missing"); return; } - /* we're using only shared dictionary, the username doesn't matter. */ if (dict_init(dict_uri, DICT_DATA_TYPE_UINT32, "", user->set->base_dir, &db, &error) < 0) { -- 2.47.3