X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel_dirs.c;h=f12e49bfc70eb7e7a91cf545e0416d4ecc89847a;hb=86b8c2044cdc25dff1711458185e514c350ddc69;hp=1d72fd70d33a8ec70e99d0a4fa3daa68059120fa;hpb=3cc8a4d20354f4a7eb42af3864d794bad0582d0e;p=citadel.git

diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c
index 1d72fd70d..f12e49bfc 100644
--- a/citadel/citadel_dirs.c
+++ b/citadel/citadel_dirs.c
@@ -46,6 +46,7 @@ char ctdl_netin_dir[PATH_MAX]="network/spoolin";
 char ctdl_netcfg_dir[PATH_MAX]="netconfigs";
 char ctdl_sbin_dir[PATH_MAX];
 char ctdl_bin_dir[PATH_MAX];
+char ctdl_ssl_dir[PATH_MAX];
 
 /* some of our files, that are needed in several places */
 char file_citadel_control[PATH_MAX]="";
@@ -57,6 +58,9 @@ char file_arcq[PATH_MAX]="";
 char file_citadel_socket[PATH_MAX]="";
 char file_mail_aliases[PATH_MAX]="";
 char file_pid_file[PATH_MAX]="";
+char file_crpt_file_key[PATH_MAX]="";
+char file_crpt_file_csr[PATH_MAX]="";
+char file_crpt_file_cer[PATH_MAX]="";
 
 int home_specified = 0;
 
@@ -115,6 +119,9 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
 #endif
 	COMPUTE_DIRECTORY(ctdl_run_dir);
 
+	basedir=SSL_DIR;
+	COMPUTE_DIRECTORY(ctdl_ssl_dir);
+
 #ifndef HAVE_DATA_DIR
 	basedir=ctdldir;
 #else
@@ -179,6 +186,18 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
 			 "%srefcount_adjustments.dat",
 			 ctdl_run_dir);
 
+	snprintf(file_crpt_file_key,
+		 sizeof file_crpt_file_key, 
+		 "%scitadel.key",
+		 ctdl_ssl_dir);
+	snprintf(file_crpt_file_csr,
+		 sizeof file_crpt_file_csr, 
+		 "%scitadel.csr",
+		 ctdl_ssl_dir);
+	snprintf(file_crpt_file_cer,
+		 sizeof file_crpt_file_cer, 
+		 "%scitadel.cer",
+		 ctdl_ssl_dir);
 	/* 
 	 * DIRTY HACK FOLLOWS! due to configs in the network dir in the 
 	 * legacy installations, we need to calculate ifdeffed here.