* Removed ctdl_ssl_dir because there was already ctdl_key_dir, and

  ctdl_ssl_dir was being calculated incorrectly anyway.

diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c
index f12e49bfc70eb7e7a91cf545e0416d4ecc89847a..4c2170eb256b51172e611932a920f852653859db 100644 (file)
--- a/citadel/citadel_dirs.c
+++ b/citadel/citadel_dirs.c
@@ -46,7 +46,6 @@ 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]="";
@@ -119,9 +118,6 @@ 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
@@ -189,15 +185,15 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
        snprintf(file_crpt_file_key,
                 sizeof file_crpt_file_key, 
                 "%scitadel.key",
-                ctdl_ssl_dir);
+                ctdl_key_dir);
        snprintf(file_crpt_file_csr,
                 sizeof file_crpt_file_csr, 
                 "%scitadel.csr",
-                ctdl_ssl_dir);
+                ctdl_key_dir);
        snprintf(file_crpt_file_cer,
                 sizeof file_crpt_file_cer, 
                 "%scitadel.cer",
-                ctdl_ssl_dir);
+                ctdl_key_dir);
        /* 
         * DIRTY HACK FOLLOWS! due to configs in the network dir in the 
         * legacy installations, we need to calculate ifdeffed here.

diff --git a/citadel/serv_crypto.c b/citadel/serv_crypto.c
index e9616b8259dff62b568007d75bc5dd83ebe21fd1..ab6bd6f4c0a8fe1958c791cfb5174d4f37f16cdf 100644 (file)
--- a/citadel/serv_crypto.c
+++ b/citadel/serv_crypto.c
@@ -147,7 +147,7 @@ void init_ssl(void)
        /* Get our certificates in order.
         * First, create the key/cert directory if it's not there already...
         */
-       mkdir(ctdl_ssl_dir, 0700);
+       mkdir(ctdl_key_dir, 0700);
 
        /*
         * Generate a key pair if we don't have one.