changeset 658:1a86a8b6e6ff HEAD

Use --with-ssldir directory instead of hardcoded /etc/ssl
author Timo Sirainen <tss@iki.fi>
date Mon, 25 Nov 2002 00:08:37 +0200
parents 85a888d2766e
children 47cdbb98fdae
files src/master/Makefile.am src/master/settings.c
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/master/Makefile.am	Mon Nov 25 00:07:53 2002 +0200
+++ b/src/master/Makefile.am	Mon Nov 25 00:08:37 2002 +0200
@@ -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 \
--- a/src/master/settings.c	Mon Nov 25 00:07:53 2002 +0200
+++ b/src/master/settings.c	Mon Nov 25 00:08:37 2002 +0200
@@ -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;