]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
mail-crypt: Remove "plugin disabled" texts from errors
authorTimo Sirainen <timo.sirainen@open-xchange.com>
Tue, 31 Mar 2020 10:51:09 +0000 (13:51 +0300)
committerMarco Bettini <marco.bettini@open-xchange.com>
Thu, 17 Feb 2022 13:59:22 +0000 (14:59 +0100)
The plugin isn't just disabled, the user initialization fails entirely.

src/plugins/mail-crypt/mail-crypt-plugin.c

index 2eb56ef903cf23ef4a32d7e95a6828381c2d7967..4d09b668345d6d079256e652d7864b90e3acadaa 100644 (file)
@@ -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') {