plugins: acl - Rename acl init() function to init_legacy()

diff --git a/src/plugins/acl/acl-api-private.h b/src/plugins/acl/acl-api-private.h
index c6ec37cccb53e1756ec90f39760380d9eb429282..79ed24159578d40242c1a21fe31747d0e2f6e68b 100644 (file)
--- a/src/plugins/acl/acl-api-private.h
+++ b/src/plugins/acl/acl-api-private.h
@@ -7,7 +7,7 @@
 struct acl_backend_vfuncs {
        const char *name;
        struct acl_backend *(*alloc)(void);
-       int (*init)(struct acl_backend *backend, const char *data);
+       int (*init_legacy)(struct acl_backend *backend, const char *data);
        void (*deinit)(struct acl_backend *backend);
 
        struct acl_mailbox_list_context *

diff --git a/src/plugins/acl/acl-backend-vfile.c b/src/plugins/acl/acl-backend-vfile.c
index 9fa9cc9343d7e703f99dfc70e2095104ad62e636..34727ea3eb19873cd71644791eed4d3addaf40ba 100644 (file)
--- a/src/plugins/acl/acl-backend-vfile.c
+++ b/src/plugins/acl/acl-backend-vfile.c
@@ -29,7 +29,7 @@ static struct acl_backend *acl_backend_vfile_alloc(void)
 }
 
 static int
-acl_backend_vfile_init(struct acl_backend *_backend, const char *data)
+acl_backend_vfile_init_legacy(struct acl_backend *_backend, const char *data)
 {
        struct event *event = _backend->event;
        struct acl_backend_vfile *backend =
@@ -564,7 +564,7 @@ static int acl_backend_vfile_object_last_changed(struct acl_object *_aclobj,
 const struct acl_backend_vfuncs acl_backend_vfile = {
        .name = "vfile",
        .alloc = acl_backend_vfile_alloc,
-       .init = acl_backend_vfile_init,
+       .init_legacy = acl_backend_vfile_init_legacy,
        .deinit = acl_backend_vfile_deinit,
        .nonowner_lookups_iter_init = acl_backend_vfile_nonowner_iter_init,
        .nonowner_lookups_iter_next = acl_backend_vfile_nonowner_iter_next,

diff --git a/src/plugins/acl/acl-backend.c b/src/plugins/acl/acl-backend.c
index 712eaba24b614909f77d383ca1717cfa20a5f525..e3c9970705efa878c3e112e3ef9bafa391023d9e 100644 (file)
--- a/src/plugins/acl/acl-backend.c
+++ b/src/plugins/acl/acl-backend.c
@@ -85,7 +85,7 @@ acl_backend_init(const char *data, struct mailbox_list *list,
        backend->set = set;
 
        T_BEGIN {
-               if (backend->v->init(backend, data) < 0)
+               if (backend->v->init_legacy(backend, data) < 0)
                        i_fatal("acl: backend %s init failed with data: %s",
                                backend->v->name, data);
        } T_END;