Mercurial > dovecot > core-2.2

changeset 21303:e48ccffc7815

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Aki Tuomi <aki.tuomi@dovecot.fi>
date Fri, 09 Dec 2016 16:01:20 +0200
parents f677d31a8211
children 3095a4ed77e5
files src/plugins/mail-crypt/mail-crypt-plugin.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/mail-crypt/mail-crypt-plugin.c	Wed Dec 14 17:39:04 2016 +0200
+++ b/src/plugins/mail-crypt/mail-crypt-plugin.c	Fri Dec 09 16:01:20 2016 +0200
@@ -392,7 +392,7 @@
 
 	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");
@@ -410,7 +410,7 @@
 	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 "