mail-crypt: Treat empty values correctly

If mail_crypt_curve or mail_crypt_save_version
is left empty, disable the plugin. Don't error
out.

diff --git a/src/plugins/mail-crypt/mail-crypt-plugin.c b/src/plugins/mail-crypt/mail-crypt-plugin.c
index a40ebc795e66b03afcd7cad3260bdac417c765e8..27c7ac16cf8b03039af159509ac29d62f800afbf 100644 (file)
--- a/src/plugins/mail-crypt/mail-crypt-plugin.c
+++ b/src/plugins/mail-crypt/mail-crypt-plugin.c
@@ -388,7 +388,7 @@ static void mail_crypt_mail_user_created(struct mail_user *user)
 
        const char *curve = mail_user_plugin_getenv(user, "mail_crypt_curve");
        buffer_t *tmp = t_str_new(64);
-       if (curve == NULL) {
+       if (curve == NULL || *curve == '\0') {
                if (user->mail_debug) {
                        i_debug("mail_crypt_plugin: mail_crypt_curve setting "
                                "missing - generating EC keys disabled");
@@ -406,7 +406,7 @@ static void mail_crypt_mail_user_created(struct mail_user *user)
        const char *version = mail_user_plugin_getenv(user,
                        "mail_crypt_save_version");
 
-       if (version == NULL) {
+       if (version == NULL || *version == '\0') {
                user->error = p_strdup_printf(user->pool,
                                "mail_crypt_plugin: "
                                "mail_crypt_save_version setting missing "