From a707e6907c5ea3bbf2f5086a41a22726ad2aea11 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Tue, 31 Mar 2020 13:51:09 +0300 Subject: [PATCH] mail-crypt: Remove "plugin disabled" texts from errors The plugin isn't just disabled, the user initialization fails entirely. --- src/plugins/mail-crypt/mail-crypt-plugin.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/mail-crypt/mail-crypt-plugin.c b/src/plugins/mail-crypt/mail-crypt-plugin.c index 2eb56ef903..4d09b66834 100644 --- a/src/plugins/mail-crypt/mail-crypt-plugin.c +++ b/src/plugins/mail-crypt/mail-crypt-plugin.c @@ -415,8 +415,7 @@ static void mail_crypt_mail_user_created(struct mail_user *user) } else if (!dcrypt_name2oid(curve, tmp, &error)) { user->error = p_strdup_printf(user->pool, "mail_crypt_plugin: " - "invalid mail_crypt_curve setting %s: %s - " - "plugin disabled", + "invalid mail_crypt_curve setting %s: %s", curve, error); } else { muser->curve = p_strdup(user->pool, curve); @@ -428,8 +427,7 @@ static void mail_crypt_mail_user_created(struct mail_user *user) if (version == NULL || *version == '\0') { user->error = p_strdup_printf(user->pool, "mail_crypt_plugin: " - "mail_crypt_save_version setting missing " - "- plugin disabled"); + "mail_crypt_save_version setting missing"); } else if (version[0] == '0') { muser->save_version = 0; } else if (version[0] == '1') { -- 2.47.3