From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Tue, 14 Jun 2016 09:30:27 +0000 (+0300)
Subject: dcrypt: Arm deinitialization code
X-Git-Tag: 2.2.25.rc1~143
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a63f6d227f200b1c73a3ebfc0b6131cd40d17f67;p=thirdparty%2Fdovecot%2Fcore.git

dcrypt: Arm deinitialization code
---

diff --git a/src/lib-dcrypt/dcrypt.c b/src/lib-dcrypt/dcrypt.c
index be35124c2b..e8b2d00bfe 100644
--- a/src/lib-dcrypt/dcrypt.c
+++ b/src/lib-dcrypt/dcrypt.c
@@ -10,7 +10,9 @@ bool dcrypt_initialize(const char *backend, const char **error_r)
 {
 	struct module_dir_load_settings mod_set;
 
-	if (dcrypt_vfs != NULL) return TRUE;
+	if (dcrypt_vfs != NULL) {
+		return TRUE;
+	}
 	if (backend == NULL) backend = "openssl"; /* default for now */
 
 	const char *implementation = t_strconcat("dcrypt_",backend,NULL);
@@ -34,13 +36,12 @@ bool dcrypt_initialize(const char *backend, const char **error_r)
 	/* Destroy SSL module after(most of) the others. Especially lib-fs
 	   backends may still want to access SSL module in their own
 	   atexit-callbacks. */
-//	lib_atexit_priority(dcrypt_deinitialize, LIB_ATEXIT_PRIORITY_LOW);
+	lib_atexit_priority(dcrypt_deinitialize, LIB_ATEXIT_PRIORITY_LOW);
 	return TRUE;
 }
 
 void dcrypt_deinitialize(void)
 {
-	i_error("I got called");
 	if (dcrypt_module != NULL) {
 		dcrypt_module->deinit();
 		module_dir_unload(&dcrypt_module);