dovecot-2.2: lib-storage: Replaced pop3c_ssl_ca_dir and imapc_ss...
dovecot at dovecot.org
dovecot at dovecot.org
Mon Feb 25 15:52:39 EET 2013
details: http://hg.dovecot.org/dovecot-2.2/rev/5998396f0928
changeset: 15932:5998396f0928
user: Timo Sirainen <tss at iki.fi>
date: Mon Feb 25 15:52:00 2013 +0200
description:
lib-storage: Replaced pop3c_ssl_ca_dir and imapc_ssl_ca_dir with generic ssl_client_ca_dir.
diffstat:
src/lib-storage/index/imapc/imapc-settings.c | 12 ++++++------
src/lib-storage/index/imapc/imapc-settings.h | 2 +-
src/lib-storage/index/imapc/imapc-storage.c | 2 +-
src/lib-storage/index/pop3c/pop3c-settings.c | 12 ++++++------
src/lib-storage/index/pop3c/pop3c-settings.h | 2 +-
src/lib-storage/index/pop3c/pop3c-storage.c | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diffs (152 lines):
diff -r 6b0c284ecede -r 5998396f0928 src/lib-storage/index/imapc/imapc-settings.c
--- a/src/lib-storage/index/imapc/imapc-settings.c Mon Feb 25 15:51:16 2013 +0200
+++ b/src/lib-storage/index/imapc/imapc-settings.c Mon Feb 25 15:52:00 2013 +0200
@@ -22,7 +22,6 @@
DEF(SET_STR, imapc_password),
DEF(SET_ENUM, imapc_ssl),
- DEF(SET_STR, imapc_ssl_ca_dir),
DEF(SET_BOOL, imapc_ssl_verify),
DEF(SET_STR, imapc_features),
@@ -30,6 +29,7 @@
DEF(SET_STR, imapc_list_prefix),
DEF(SET_TIME, imapc_max_idle_time),
+ DEF(SET_STR, ssl_client_ca_dir),
DEF(SET_STR, ssl_crypto_device),
SETTING_DEFINE_LIST_END
@@ -44,7 +44,6 @@
.imapc_password = "",
.imapc_ssl = "no:imaps:starttls",
- .imapc_ssl_ca_dir = "",
.imapc_ssl_verify = TRUE,
.imapc_features = "",
@@ -52,6 +51,7 @@
.imapc_list_prefix = "",
.imapc_max_idle_time = 60*29,
+ .ssl_client_ca_dir = "",
.ssl_crypto_device = ""
};
@@ -123,11 +123,11 @@
return FALSE;
}
#ifndef CONFIG_BINARY
- if (*set->imapc_ssl_ca_dir != '\0' &&
- access(set->imapc_ssl_ca_dir, X_OK) < 0) {
+ if (*set->ssl_client_ca_dir != '\0' &&
+ access(set->ssl_client_ca_dir, X_OK) < 0) {
*error_r = t_strdup_printf(
- "imapc_ssl_ca_dir: access(%s) failed: %m",
- set->imapc_ssl_ca_dir);
+ "ssl_client_ca_dir: access(%s) failed: %m",
+ set->ssl_client_ca_dir);
return FALSE;
}
#endif
diff -r 6b0c284ecede -r 5998396f0928 src/lib-storage/index/imapc/imapc-settings.h
--- a/src/lib-storage/index/imapc/imapc-settings.h Mon Feb 25 15:51:16 2013 +0200
+++ b/src/lib-storage/index/imapc/imapc-settings.h Mon Feb 25 15:52:00 2013 +0200
@@ -17,7 +17,6 @@
const char *imapc_password;
const char *imapc_ssl;
- const char *imapc_ssl_ca_dir;
bool imapc_ssl_verify;
const char *imapc_features;
@@ -25,6 +24,7 @@
const char *imapc_list_prefix;
unsigned int imapc_max_idle_time;
+ const char *ssl_client_ca_dir;
const char *ssl_crypto_device;
enum imapc_features parsed_features;
diff -r 6b0c284ecede -r 5998396f0928 src/lib-storage/index/imapc/imapc-storage.c
--- a/src/lib-storage/index/imapc/imapc-storage.c Mon Feb 25 15:51:16 2013 +0200
+++ b/src/lib-storage/index/imapc/imapc-storage.c Mon Feb 25 15:52:00 2013 +0200
@@ -243,7 +243,7 @@
mail_user_set_get_temp_prefix(str, _storage->user->set);
set.temp_path_prefix = str_c(str);
- set.ssl_ca_dir = storage->set->imapc_ssl_ca_dir;
+ set.ssl_ca_dir = storage->set->ssl_client_ca_dir;
set.ssl_verify = storage->set->imapc_ssl_verify;
if (strcmp(storage->set->imapc_ssl, "imaps") == 0)
set.ssl_mode = IMAPC_CLIENT_SSL_MODE_IMMEDIATE;
diff -r 6b0c284ecede -r 5998396f0928 src/lib-storage/index/pop3c/pop3c-settings.c
--- a/src/lib-storage/index/pop3c/pop3c-settings.c Mon Feb 25 15:51:16 2013 +0200
+++ b/src/lib-storage/index/pop3c/pop3c-settings.c Mon Feb 25 15:52:00 2013 +0200
@@ -22,10 +22,10 @@
DEF(SET_STR, pop3c_password),
DEF(SET_ENUM, pop3c_ssl),
- DEF(SET_STR, pop3c_ssl_ca_dir),
DEF(SET_BOOL, pop3c_ssl_verify),
DEF(SET_STR, pop3c_rawlog_dir),
+ DEF(SET_STR, ssl_client_ca_dir),
DEF(SET_STR, ssl_crypto_device),
SETTING_DEFINE_LIST_END
@@ -40,10 +40,10 @@
.pop3c_password = "",
.pop3c_ssl = "no:pop3s:starttls",
- .pop3c_ssl_ca_dir = "",
.pop3c_ssl_verify = TRUE,
.pop3c_rawlog_dir = "",
+ .ssl_client_ca_dir = "",
.ssl_crypto_device = ""
};
@@ -77,11 +77,11 @@
return FALSE;
}
#ifndef CONFIG_BINARY
- if (*set->pop3c_ssl_ca_dir != '\0' &&
- access(set->pop3c_ssl_ca_dir, X_OK) < 0) {
+ if (*set->ssl_client_ca_dir != '\0' &&
+ access(set->ssl_client_ca_dir, X_OK) < 0) {
*error_r = t_strdup_printf(
- "pop3c_ssl_ca_dir: access(%s) failed: %m",
- set->pop3c_ssl_ca_dir);
+ "ssl_client_ca_dir: access(%s) failed: %m",
+ set->ssl_client_ca_dir);
return FALSE;
}
#endif
diff -r 6b0c284ecede -r 5998396f0928 src/lib-storage/index/pop3c/pop3c-settings.h
--- a/src/lib-storage/index/pop3c/pop3c-settings.h Mon Feb 25 15:51:16 2013 +0200
+++ b/src/lib-storage/index/pop3c/pop3c-settings.h Mon Feb 25 15:52:00 2013 +0200
@@ -10,10 +10,10 @@
const char *pop3c_password;
const char *pop3c_ssl;
- const char *pop3c_ssl_ca_dir;
bool pop3c_ssl_verify;
const char *pop3c_rawlog_dir;
+ const char *ssl_client_ca_dir;
const char *ssl_crypto_device;
};
diff -r 6b0c284ecede -r 5998396f0928 src/lib-storage/index/pop3c/pop3c-storage.c
--- a/src/lib-storage/index/pop3c/pop3c-storage.c Mon Feb 25 15:51:16 2013 +0200
+++ b/src/lib-storage/index/pop3c/pop3c-storage.c Mon Feb 25 15:52:00 2013 +0200
@@ -73,7 +73,7 @@
client_set.rawlog_dir =
mail_user_home_expand(user, set->pop3c_rawlog_dir);
- client_set.ssl_ca_dir = set->pop3c_ssl_ca_dir;
+ client_set.ssl_ca_dir = set->ssl_client_ca_dir;
client_set.ssl_verify = set->pop3c_ssl_verify;
if (strcmp(set->pop3c_ssl, "pop3s") == 0)
client_set.ssl_mode = POP3C_CLIENT_SSL_MODE_IMMEDIATE;
More information about the dovecot-cvs
mailing list