dovecot-2.1: imapc: Pass ssl_crypto_device setting to lib-ssl-io...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.1/rev/e8c6ff480a18
changeset: 13775:e8c6ff480a18
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Nov 24 01:50:35 2011 +0200
description:
imapc: Pass ssl_crypto_device setting to lib-ssl-iostream.

diffstat:

 src/lib-imap-client/imapc-client.c           |  1 +
 src/lib-imap-client/imapc-client.h           |  1 +
 src/lib-storage/index/imapc/imapc-settings.c |  4 +++-
 src/lib-storage/index/imapc/imapc-settings.h |  1 +
 src/lib-storage/index/imapc/imapc-storage.c  |  1 +
 5 files changed, 7 insertions(+), 1 deletions(-)

diffs (65 lines):

diff -r e56409d9615c -r e8c6ff480a18 src/lib-imap-client/imapc-client.c
--- a/src/lib-imap-client/imapc-client.c	Thu Nov 24 01:49:58 2011 +0200
+++ b/src/lib-imap-client/imapc-client.c	Thu Nov 24 01:50:35 2011 +0200
@@ -64,6 +64,7 @@
 		memset(&ssl_set, 0, sizeof(ssl_set));
 		ssl_set.ca_dir = set->ssl_ca_dir;
 		ssl_set.verify_remote_cert = set->ssl_verify;
+		ssl_set.crypto_device = set->ssl_crypto_device;
 
 		source = t_strdup_printf("%s:%u", set->host, set->port);
 		if (ssl_iostream_context_init_client(source, &ssl_set,
diff -r e56409d9615c -r e8c6ff480a18 src/lib-imap-client/imapc-client.h
--- a/src/lib-imap-client/imapc-client.h	Thu Nov 24 01:49:58 2011 +0200
+++ b/src/lib-imap-client/imapc-client.h	Thu Nov 24 01:50:35 2011 +0200
@@ -59,6 +59,7 @@
 	bool ssl_verify;
 
 	const char *rawlog_dir;
+	const char *ssl_crypto_device;
 	bool debug;
 };
 
diff -r e56409d9615c -r e8c6ff480a18 src/lib-storage/index/imapc/imapc-settings.c
--- a/src/lib-storage/index/imapc/imapc-settings.c	Thu Nov 24 01:49:58 2011 +0200
+++ b/src/lib-storage/index/imapc/imapc-settings.c	Thu Nov 24 01:50:35 2011 +0200
@@ -25,6 +25,7 @@
 	DEF(SET_BOOL, imapc_ssl_verify),
 
 	DEF(SET_STR, imapc_rawlog_dir),
+	DEF(SET_STR, ssl_crypto_device),
 
 	SETTING_DEFINE_LIST_END
 };
@@ -40,7 +41,8 @@
 	.imapc_ssl_ca_dir = "",
 	.imapc_ssl_verify = TRUE,
 
-	.imapc_rawlog_dir = ""
+	.imapc_rawlog_dir = "",
+	.ssl_crypto_device = ""
 };
 
 static const struct setting_parser_info imapc_setting_parser_info = {
diff -r e56409d9615c -r e8c6ff480a18 src/lib-storage/index/imapc/imapc-settings.h
--- a/src/lib-storage/index/imapc/imapc-settings.h	Thu Nov 24 01:49:58 2011 +0200
+++ b/src/lib-storage/index/imapc/imapc-settings.h	Thu Nov 24 01:50:35 2011 +0200
@@ -13,6 +13,7 @@
 	bool imapc_ssl_verify;
 
 	const char *imapc_rawlog_dir;
+	const char *ssl_crypto_device;
 };
 
 const struct setting_parser_info *imapc_get_setting_parser_info(void);
diff -r e56409d9615c -r e8c6ff480a18 src/lib-storage/index/imapc/imapc-storage.c
--- a/src/lib-storage/index/imapc/imapc-storage.c	Thu Nov 24 01:49:58 2011 +0200
+++ b/src/lib-storage/index/imapc/imapc-storage.c	Thu Nov 24 01:50:35 2011 +0200
@@ -246,6 +246,7 @@
 		set.ssl_mode = IMAPC_CLIENT_SSL_MODE_STARTTLS;
 	else
 		set.ssl_mode = IMAPC_CLIENT_SSL_MODE_NONE;
+	set.ssl_crypto_device = storage->set->ssl_crypto_device;
 
 	storage->list = (struct imapc_mailbox_list *)ns->list;
 	storage->list->storage = storage;