From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Wed, 16 Aug 2023 19:21:43 +0000 (-0400)
Subject: mail-crypt: Rename mail_crypt_global_keys_load() to mail_crypt_global_keys_load_from_... 
X-Git-Tag: 2.4.1~1186
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92a05c90e2df01e2cc93a852b811644a75de87e0;p=thirdparty%2Fdovecot%2Fcore.git

mail-crypt: Rename mail_crypt_global_keys_load() to mail_crypt_global_keys_load_from_user()
---

diff --git a/src/plugins/mail-crypt/mail-crypt-global-key.h b/src/plugins/mail-crypt/mail-crypt-global-key.h
index 6f4679ac6d..123df7f020 100644
--- 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 df52cdbb6b..47cae24af7 100644
--- 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 6fc85a934b..a2627b01b7 100644
--- 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 1899d9fdba..3f7c684a47 100644
--- 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);