mail-crypt: Rename mail_crypt_global_keys_load() to mail_crypt_global_keys_load_from_...

diff --git a/src/plugins/mail-crypt/mail-crypt-global-key.h b/src/plugins/mail-crypt/mail-crypt-global-key.h
index 6f4679ac6d259482219cce7b1aea2dcca4e036a1..123df7f020e7c1fcd9de3114476f84b3713c0396 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-global-key.h
+++ b/src/plugins/mail-crypt/mail-crypt-global-key.h
@@ -13,10 +13,11 @@ struct mail_crypt_global_keys {
 
 struct mail_user;
 
-int mail_crypt_global_keys_load(struct mail_user *user, const char *set_prefix,
-                               struct mail_crypt_global_keys *global_keys_r,
-                               bool ignore_privkey_errors,
-                               const char **error_r);
+int mail_crypt_global_keys_load_from_user(struct mail_user *user,
+                                         const char *set_prefix,
+                                         struct mail_crypt_global_keys *global_keys_r,
+                                         bool ignore_privkey_errors,
+                                         const char **error_r);
 int mail_crypt_global_keys_load_pluginenv(const char *set_prefix,
                                struct mail_crypt_global_keys *global_keys_r,
                                const char **error_r);

diff --git a/src/plugins/mail-crypt/mail-crypt-key.c b/src/plugins/mail-crypt/mail-crypt-key.c
index df52cdbb6b83d2ce7eadbd9c9f181909e93bb3bd..47cae24af7380eba33e0652c5983a78c4f1f9835 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-key.c
+++ b/src/plugins/mail-crypt/mail-crypt-key.c
@@ -172,8 +172,8 @@ int mail_crypt_env_get_private_key(struct mail_user *user, const char *pubid,
 {
        struct mail_crypt_global_keys global_keys;
        int ret = 0;
-       if (mail_crypt_global_keys_load(user, "mail_crypt", &global_keys,
-                                       TRUE, error_r) < 0) {
+       if (mail_crypt_global_keys_load_from_user(user, "mail_crypt",
+                       &global_keys, TRUE, error_r) < 0) {
                mail_crypt_global_keys_free(&global_keys);
                return -1;
        }

diff --git a/src/plugins/mail-crypt/mail-crypt-plugin.c b/src/plugins/mail-crypt/mail-crypt-plugin.c
index 6fc85a934b820d3cc6e5b7039577afd78733517c..a2627b01b7e80292fc5ea3049b83fdf5742bf103 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-plugin.c
+++ b/src/plugins/mail-crypt/mail-crypt-plugin.c
@@ -455,7 +455,7 @@ static void mail_crypt_mail_user_created(struct mail_user *user)
                                version);
        }
 
-       if (mail_crypt_global_keys_load(user, "mail_crypt_global",
+       if (mail_crypt_global_keys_load_from_user(user, "mail_crypt_global",
                                        &muser->global_keys, FALSE, &error) < 0) {
                user->error = p_strdup_printf(user->pool,
                                "mail_crypt_plugin: %s", error);

diff --git a/src/plugins/mail-crypt/mail-crypt-userenv.c b/src/plugins/mail-crypt/mail-crypt-userenv.c
index 1899d9fdba5d0a52983a74b126ae1233d8a1c2af..3f7c684a4722e3464b47099005f048f90bd33e2d 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-userenv.c
+++ b/src/plugins/mail-crypt/mail-crypt-userenv.c
@@ -43,10 +43,10 @@ mail_crypt_load_global_private_keys(struct mail_user *user,
        return 0;
 }
 
-int mail_crypt_global_keys_load(struct mail_user *user, const char *set_prefix,
-                               struct mail_crypt_global_keys *global_keys_r,
-                               bool ignore_privkey_errors,
-                               const char **error_r)
+int mail_crypt_global_keys_load_from_user(struct mail_user *user, const char *set_prefix,
+                                         struct mail_crypt_global_keys *global_keys_r,
+                                         bool ignore_privkey_errors,
+                                         const char **error_r)
 {
        const char *set_key = t_strconcat(set_prefix, "_public_key", NULL);
        const char *key_data = mail_user_plugin_getenv(user, set_key);