[dovecot-cvs] dovecot/src/master login-process.c, 1.49,
1.50 master-settings.c, 1.37, 1.38 master-settings.h, 1.21, 1.22
cras at procontrol.fi
cras at procontrol.fi
Mon Jan 19 19:07:23 EET 2004
Update of /home/cvs/dovecot/src/master
In directory talvi:/tmp/cvs-serv1884/master
Modified Files:
login-process.c master-settings.c master-settings.h
Log Message:
Added setting ssl_ca_file, patch by Zach Bagnall
Index: login-process.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/login-process.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- login-process.c 3 Dec 2003 00:40:22 -0000 1.49
+++ login-process.c 19 Jan 2004 17:07:21 -0000 1.50
@@ -382,6 +382,10 @@
env_put("DOVECOT_MASTER=1");
if (!set->ssl_disable) {
+ if (set->ssl_ca_file != NULL) {
+ env_put(t_strconcat("SSL_CA_FILE=",
+ set->ssl_ca_file, NULL));
+ }
env_put(t_strconcat("SSL_CERT_FILE=",
set->ssl_cert_file, NULL));
env_put(t_strconcat("SSL_KEY_FILE=",
Index: master-settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- master-settings.c 13 Nov 2003 16:05:36 -0000 1.37
+++ master-settings.c 19 Jan 2004 17:07:21 -0000 1.38
@@ -46,6 +46,7 @@
DEF(SET_STR, ssl_listen),
DEF(SET_BOOL, ssl_disable),
+ DEF(SET_STR, ssl_ca_file),
DEF(SET_STR, ssl_cert_file),
DEF(SET_STR, ssl_key_file),
DEF(SET_STR, ssl_parameters_file),
@@ -164,6 +165,7 @@
MEMBER(ssl_listen) NULL,
MEMBER(ssl_disable) FALSE,
+ MEMBER(ssl_ca_file) NULL,
MEMBER(ssl_cert_file) SSLDIR"/certs/dovecot.pem",
MEMBER(ssl_key_file) SSLDIR"/private/dovecot.pem",
MEMBER(ssl_parameters_file) "ssl-parameters.dat",
@@ -418,6 +420,12 @@
#ifdef HAVE_SSL
if (!set->ssl_disable) {
+ if (set->ssl_ca_file != NULL &&
+ access(set->ssl_ca_file, R_OK) < 0) {
+ i_fatal("Can't use SSL CA file %s: %m",
+ set->ssl_ca_file);
+ }
+
if (access(set->ssl_cert_file, R_OK) < 0) {
i_error("Can't use SSL certificate %s: %m",
set->ssl_cert_file);
Index: master-settings.h
===================================================================
RCS file: /home/cvs/dovecot/src/master/master-settings.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- master-settings.h 15 Sep 2003 14:02:07 -0000 1.21
+++ master-settings.h 19 Jan 2004 17:07:21 -0000 1.22
@@ -23,6 +23,7 @@
const char *ssl_listen;
int ssl_disable;
+ const char *ssl_ca_file;
const char *ssl_cert_file;
const char *ssl_key_file;
const char *ssl_parameters_file;
More information about the dovecot-cvs
mailing list