lib-dict, global: Rename dict_init() to dict_init_legacy()

diff --git a/src/auth/db-dict.c b/src/auth/db-dict.c
index 0aa9b9add35e044fde2b365d66e9003d36863f37..7ffeaa3fb130df8f15a4fe9f5605e60e86046ca7 100644 (file)
--- a/src/auth/db-dict.c
+++ b/src/auth/db-dict.c
@@ -263,7 +263,7 @@ struct dict_connection *db_dict_init(const char *config_path)
        i_zero(&dict_set);
        dict_set.base_dir = global_auth_settings->base_dir;
        dict_set.event_parent = auth_event;
-       if (dict_init(conn->set.uri, &dict_set, &conn->dict, &error) < 0)
+       if (dict_init_legacy(conn->set.uri, &dict_set, &conn->dict, &error) < 0)
                i_fatal("dict %s: Failed to init dict: %s", config_path, error);
 
        conn->next = connections;

diff --git a/src/auth/db-oauth2.c b/src/auth/db-oauth2.c
index ad682fa3e6e1d84403e76c169a7ce53228fd5d82..a975be8ee2b2225e05bea6ab83d5144f0520361e 100644 (file)
--- a/src/auth/db-oauth2.c
+++ b/src/auth/db-oauth2.c
@@ -295,8 +295,8 @@ struct db_oauth2 *db_oauth2_init(const char *config_path)
                        .base_dir = global_auth_settings->base_dir,
                        .event_parent = auth_event,
                };
-               if (dict_init(db->set.local_validation_key_dict, &dict_set,
-                             &db->oauth2_set.key_dict, &error) < 0)
+               if (dict_init_legacy(db->set.local_validation_key_dict, &dict_set,
+                                    &db->oauth2_set.key_dict, &error) < 0)
                        i_fatal("Cannot initialize key dict: %s", error);
                /* failure to initialize dcrypt is not fatal - we can still
                   validate HMAC based keys */

diff --git a/src/dict/dict-expire.c b/src/dict/dict-expire.c
index 9b0126af978f84037807c067efb138a372b24707..691b861b1b68da8955d922e7d5c7507cc2676954 100644 (file)
--- a/src/dict/dict-expire.c
+++ b/src/dict/dict-expire.c
@@ -78,7 +78,7 @@ static void dict_expire_init(void)
                const char *name = strlist[i];
                const char *uri = strlist[i+1];
 
-               if (dict_init(uri, &dict_set, &dict, &error) < 0) {
+               if (dict_init_legacy(uri, &dict_set, &dict, &error) < 0) {
                        i_error("Failed to initialize dictionary '%s': %s - skipping",
                                name, error);
                } else {

diff --git a/src/dict/dict-init-cache.c b/src/dict/dict-init-cache.c
index ed76940b04df2de58eb31c12761f201cf5dfbb85..3dc52f2b45c317fac3da5c4b6bb3c9669e5449c3 100644 (file)
--- a/src/dict/dict-init-cache.c
+++ b/src/dict/dict-init-cache.c
@@ -84,7 +84,7 @@ int dict_init_cache_get(const char *dict_name, const char *uri,
 
        match = dict_init_cache_find(dict_name);
        if (match == NULL) {
-               if (dict_init(uri, set, dict_r, error_r) < 0)
+               if (dict_init_legacy(uri, set, dict_r, error_r) < 0)
                        return -1;
                match = dict_init_cache_add(dict_name, *dict_r);
        } else {

diff --git a/src/doveadm/doveadm-dict.c b/src/doveadm/doveadm-dict.c
index ff50e9a82f0d70493d86f281709e03afec6793c1..54c3215833f1f404884ef21948804f4e631dee36 100644 (file)
--- a/src/doveadm/doveadm-dict.c
+++ b/src/doveadm/doveadm-dict.c
@@ -57,7 +57,7 @@ cmd_dict_init_full(struct doveadm_cmd_context *cctx,
        dict_drivers_register_builtin();
        i_zero(&dict_set);
        dict_set.base_dir = doveadm_settings->base_dir;
-       if (dict_init(dict_uri, &dict_set, &dict, &error) < 0) {
+       if (dict_init_legacy(dict_uri, &dict_set, &dict, &error) < 0) {
                e_error(cctx->event,
                        "dict_init(%s) failed: %s", dict_uri, error);
                doveadm_exit_code = EX_TEMPFAIL;

diff --git a/src/lib-dict-backend/test-dict-sql.c b/src/lib-dict-backend/test-dict-sql.c
index 4de45eb5c1802b660323a0196af074f42dc2b374..08c511b0753a135f86fc5c43d0916a806469364c 100644 (file)
--- a/src/lib-dict-backend/test-dict-sql.c
+++ b/src/lib-dict-backend/test-dict-sql.c
@@ -21,7 +21,7 @@ static void test_setup(struct dict **dict_r)
        };
        struct dict *dict = NULL;
 
-       if (dict_init("mysql:" DICT_SRC_DIR "/dict.conf", &set, &dict, &error) < 0)
+       if (dict_init_legacy("mysql:" DICT_SRC_DIR "/dict.conf", &set, &dict, &error) < 0)
                i_fatal("cannot initialize dict: %s", error);
 
        *dict_r = dict;

diff --git a/src/lib-dict-extra/test-dict-fs.c b/src/lib-dict-extra/test-dict-fs.c
index a7b9905b4a06efbe2c37e5ee88066eae1dab79aa..c043c8bbcd35181914b39df05cbf61e9cce2d9c8 100644 (file)
--- a/src/lib-dict-extra/test-dict-fs.c
+++ b/src/lib-dict-extra/test-dict-fs.c
@@ -40,7 +40,7 @@ static void test_dict_fs_set_get(void)
        struct dict_settings set = {
                .base_dir = ".",
        };
-       if (dict_init("fs:posix:prefix=.test-dict/", &set, &dict, &error) < 0)
+       if (dict_init_legacy("fs:posix:prefix=.test-dict/", &set, &dict, &error) < 0)
                i_fatal("dict_init() failed: %s", error);
 
        /* shared paths */

diff --git a/src/lib-dict/dict.c b/src/lib-dict/dict.c
index a453352067bc12e1c48cf65b27506f998d1557d5..6cea97fb60921c6f756d7bf0bdcd0578ee2f21e0 100644 (file)
--- a/src/lib-dict/dict.c
+++ b/src/lib-dict/dict.c
@@ -87,8 +87,8 @@ void dict_driver_unregister(struct dict *driver)
                array_free(&dict_drivers);
 }
 
-int dict_init(const char *uri, const struct dict_settings *set,
-             struct dict **dict_r, const char **error_r)
+int dict_init_legacy(const char *uri, const struct dict_settings *set,
+                    struct dict **dict_r, const char **error_r)
 {
        struct dict_settings set_dup = *set;
        struct dict *dict;

diff --git a/src/lib-dict/dict.h b/src/lib-dict/dict.h
index 18ef56fd84a729b9db51ff46d5b99115d67f2c02..c485d6d8698e71301071f3df76d71c4e6571a086 100644 (file)
--- a/src/lib-dict/dict.h
+++ b/src/lib-dict/dict.h
@@ -99,8 +99,8 @@ void dict_drivers_unregister_all(void);
 
 /* Open dictionary with given URI (type:data).
    Returns 0 if ok, -1 if URI is invalid. */
-int dict_init(const char *uri, const struct dict_settings *set,
-             struct dict **dict_r, const char **error_r);
+int dict_init_legacy(const char *uri, const struct dict_settings *set,
+                    struct dict **dict_r, const char **error_r);
 /* Close dictionary. */
 void dict_deinit(struct dict **dict);
 /* Wait for all pending asynchronous operations to finish. */

diff --git a/src/lib-dict/test-dict-client.c b/src/lib-dict/test-dict-client.c
index 4d4ca68df5625b047d57c3eeb910a230b8852c06..6912165b1fb525ec4a48ed1c8bea8bb2de7f6283 100644 (file)
--- a/src/lib-dict/test-dict-client.c
+++ b/src/lib-dict/test-dict-client.c
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
        set.base_dir = "/var/run/dovecot";
        opset.username = "testuser";
 
-       if (dict_init(uri, &set, &dict, &error) < 0)
+       if (dict_init_legacy(uri, &set, &dict, &error) < 0)
                i_fatal("dict_init(%s) failed: %s", argv[1], error);
 
        while (!stop) {

diff --git a/src/lib-fs/fs-dict.c b/src/lib-fs/fs-dict.c
index a93aee97bfad594741aa69355f413bcf81bc1e56..8553c379d5166e4b52febb6dc401fb32ddf88564 100644 (file)
--- a/src/lib-fs/fs-dict.c
+++ b/src/lib-fs/fs-dict.c
@@ -75,7 +75,7 @@ fs_dict_init(struct fs *_fs, const char *args, const struct fs_settings *set,
        dict_set.base_dir = set->base_dir;
        dict_set.event_parent = set->event_parent;
 
-       if (dict_init(p, &dict_set, &fs->dict, &error) < 0) {
+       if (dict_init_legacy(p, &dict_set, &fs->dict, &error) < 0) {
                *error_r = t_strdup_printf("dict_init(%s) failed: %s",
                                           args, error);
                return -1;

diff --git a/src/lib-lua/test-dict-lua.c b/src/lib-lua/test-dict-lua.c
index 0553e03353d1218aed7d1744e33e316cb5d4dbf6..f94222fc774c65494554c948dd237509fc77de71 100644 (file)
--- a/src/lib-lua/test-dict-lua.c
+++ b/src/lib-lua/test-dict-lua.c
@@ -63,7 +63,7 @@ static void test_dict_lua(void)
        test_begin("dict lua");
        struct ioloop *ioloop = io_loop_create();
        i_unlink_if_exists(".test.dict");
-       if (dict_init("file:.test.dict", &set, &dict, &error) < 0)
+       if (dict_init_legacy("file:.test.dict", &set, &dict, &error) < 0)
                i_fatal("dict_init(.test.dict) failed: %s", error);
 
        struct dlua_script *script;

diff --git a/src/lib-oauth2/test-oauth2-jwt.c b/src/lib-oauth2/test-oauth2-jwt.c
index 2a966c81ef01ae8d52d833414534fb076f64a288..733a516bad0661f4169e41f4aa53cb4b078b623d 100644 (file)
--- a/src/lib-oauth2/test-oauth2-jwt.c
+++ b/src/lib-oauth2/test-oauth2-jwt.c
@@ -941,7 +941,7 @@ static void test_do_init(void)
 
        i_unlink_if_exists(".keys");
        dict_driver_register(&dict_driver_file);
-       if (dict_init("file:.keys", &dict_set, &keys_dict, &error) < 0)
+       if (dict_init_legacy("file:.keys", &dict_set, &keys_dict, &error) < 0)
                i_fatal("dict_init(file:.keys): %s", error);
        if (!dcrypt_initialize(NULL, &dcrypt_set, &error)) {
                i_error("No functional dcrypt backend found - "

diff --git a/src/lib-storage/index/index-attribute.c b/src/lib-storage/index/index-attribute.c
index 3d4c4158cedf2033853aba241cd0abc5564c99fc..55b9ead89d1295acc3ae7c4a16b4b47774364270 100644 (file)
--- a/src/lib-storage/index/index-attribute.c
+++ b/src/lib-storage/index/index-attribute.c
@@ -65,8 +65,8 @@ index_storage_get_user_dict(struct mail_storage *err_storage,
        i_zero(&dict_set);
        dict_set.base_dir = user->set->base_dir;
        dict_set.event_parent = user->event;
-       if (dict_init(attr_storage->set->mail_attribute_dict, &dict_set,
-                     &user->_attr_dict, &error) < 0) {
+       if (dict_init_legacy(attr_storage->set->mail_attribute_dict, &dict_set,
+                            &user->_attr_dict, &error) < 0) {
                mail_storage_set_critical(err_storage,
                        "mail_attribute_dict: dict_init(%s) failed: %s",
                        attr_storage->set->mail_attribute_dict, error);
@@ -133,8 +133,8 @@ index_storage_get_dict(struct mailbox *box, enum mail_attribute_type type_flags,
        i_zero(&set);
        set.base_dir = storage->user->set->base_dir;
        set.event_parent = storage->user->event;
-       if (dict_init(storage->set->mail_attribute_dict, &set,
-                     &storage->_shared_attr_dict, &error) < 0) {
+       if (dict_init_legacy(storage->set->mail_attribute_dict, &set,
+                            &storage->_shared_attr_dict, &error) < 0) {
                mail_storage_set_critical(storage,
                        "mail_attribute_dict: dict_init(%s) failed: %s",
                        storage->set->mail_attribute_dict, error);

diff --git a/src/plugins/acl/acl-lookup-dict.c b/src/plugins/acl/acl-lookup-dict.c
index fe0f72e1f3857a95c5a5a992dee987d92ab88838..a504227904281e2f6d56b23f264008ccbc2b73cb 100644 (file)
--- a/src/plugins/acl/acl-lookup-dict.c
+++ b/src/plugins/acl/acl-lookup-dict.c
@@ -52,7 +52,7 @@ struct acl_lookup_dict *acl_lookup_dict_init(struct mail_user *user)
                i_zero(&dict_set);
                dict_set.base_dir = user->set->base_dir;
                dict_set.event_parent = user->event;
-               if (dict_init(uri, &dict_set, &dict->dict, &error) < 0)
+               if (dict_init_legacy(uri, &dict_set, &dict->dict, &error) < 0)
                        e_error(dict->event, "dict_init(%s) failed: %s", uri, error);
        } else {
                e_debug(dict->event, "No acl_shared_dict setting - "

diff --git a/src/plugins/last-login/last-login-plugin.c b/src/plugins/last-login/last-login-plugin.c
index 65fce087b7f45c532ec0dc5e627a82b8389ccf93..3f832221548acc45964f9906a819faf5d3ebe1b5 100644 (file)
--- a/src/plugins/last-login/last-login-plugin.c
+++ b/src/plugins/last-login/last-login-plugin.c
@@ -98,7 +98,7 @@ static void last_login_mail_user_created(struct mail_user *user)
        i_zero(&set);
        set.base_dir = user->set->base_dir;
        set.event_parent = user->event;
-       if (dict_init(dict_value, &set, &dict, &error) < 0) {
+       if (dict_init_legacy(dict_value, &set, &dict, &error) < 0) {
                e_error(user->event,
                        "last_login_dict: dict_init(%s) failed: %s",
                        dict_value, error);

diff --git a/src/plugins/notify-status/notify-status-plugin.c b/src/plugins/notify-status/notify-status-plugin.c
index ad048f0b0410cdf5fe46126f85cbb7729d08c0b6..d3c5259d59880f3b48ae15ec096d1646fdece4ac 100644 (file)
--- a/src/plugins/notify-status/notify-status-plugin.c
+++ b/src/plugins/notify-status/notify-status-plugin.c
@@ -55,7 +55,7 @@ static int notify_status_dict_init(struct mail_user *user, const char *uri,
                .base_dir = user->set->base_dir,
                .event_parent = user->event,
        };
-       if (dict_init(uri, &set, dict_r, error_r) < 0) {
+       if (dict_init_legacy(uri, &set, dict_r, error_r) < 0) {
                *error_r = t_strdup_printf("dict_init(%s) failed: %s",
                                           uri, *error_r);
                return -1;

diff --git a/src/plugins/quota-clone/quota-clone-plugin.c b/src/plugins/quota-clone/quota-clone-plugin.c
index 87e782ffcd86193e23bf9282b82fe5cb6705904d..cde4923a3493086877febfc5900bc38a77e5760a 100644 (file)
--- a/src/plugins/quota-clone/quota-clone-plugin.c
+++ b/src/plugins/quota-clone/quota-clone-plugin.c
@@ -283,7 +283,7 @@ static void quota_clone_mail_user_created(struct mail_user *user)
        i_zero(&dict_set);
        dict_set.base_dir = user->set->base_dir;
        dict_set.event_parent = user->event;
-       if (dict_init(uri, &dict_set, &dict, &error) < 0) {
+       if (dict_init_legacy(uri, &dict_set, &dict, &error) < 0) {
                e_error(user->event, "quota_clone_dict: Failed to initialize '%s': %s",
                        uri, error);
                return;

diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index cc11e7e94db791c7526d22a22b5534f2b349fc90..06afe4149e3436317c306f9fab9f110f9db66b11 100644 (file)
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -859,8 +859,8 @@ int quota_set_resource(struct quota_root *root, const char *name,
                i_zero(&set);
                set.base_dir = root->quota->user->set->base_dir;
                set.event_parent = root->quota->user->event;
-               if (dict_init(root->set->limit_set, &set,
-                             &root->limit_set_dict, &error) < 0) {
+               if (dict_init_legacy(root->set->limit_set, &set,
+                                    &root->limit_set_dict, &error) < 0) {
                        e_error(root->quota->event,
                                "dict_init() failed: %s", error);
                        *client_error_r = "Internal quota limit update error";