[dovecot-cvs] dovecot/src/master Makefile.am,1.4,1.5 settings.c,1.19,1.20

[cras at procontrol.fi]

Update of /home/cvs/dovecot/src/master
In directory danu:/tmp/cvs-serv28321

Modified Files:
	Makefile.am settings.c 
Log Message:
Use --with-ssldir directory instead of hardcoded /etc/ssl



Index: Makefile.am
===================================================================
RCS file: /home/cvs/dovecot/src/master/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	20 Nov 2002 14:05:14 -0000	1.4
+++ Makefile.am	24 Nov 2002 22:08:37 -0000	1.5
@@ -4,7 +4,8 @@
 	-I$(top_srcdir)/src/lib \
 	-DSYSCONFDIR=\""$(sysconfdir)"\" \
 	-DPKG_RUNDIR=\""$(localstatedir)/run/$(PACKAGE)"\" \
-	-DPKG_LIBDIR=\""$(pkglibdir)"\"
+	-DPKG_LIBDIR=\""$(pkglibdir)"\" \
+	-DSSLDIR=\""$(ssldir)\""
 
 imap_master_LDADD = \
 	../lib/liblib.a \

Index: settings.c
===================================================================
RCS file: /home/cvs/dovecot/src/master/settings.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- settings.c	21 Nov 2002 20:31:03 -0000	1.19
+++ settings.c	24 Nov 2002 22:08:37 -0000	1.20
@@ -89,8 +89,8 @@
 char *set_imap_listen = NULL;
 char *set_imaps_listen = NULL;
 
-char *set_ssl_cert_file = "/etc/ssl/certs/imapd.pem";
-char *set_ssl_key_file = "/etc/ssl/private/imapd.pem";
+char *set_ssl_cert_file = SSL_DIR"/certs/imapd.pem";
+char *set_ssl_key_file = SSL_DIR"/private/imapd.pem";
 char *set_ssl_parameters_file = PKG_RUNDIR"/ssl-parameters.dat";
 unsigned int set_ssl_parameters_regenerate = 24;
 int set_disable_plaintext_auth = FALSE;