Add a forward slash to the generated paths for citadel.key,

citadel.csr, and citadel.cer.  Without it, they were getting generated as
'/usr/local/citadel/keyscitadel.*' instead of '/usr/local/citadel/keys/citadel.*' which
is incorrect.  If this creates double slashes in the FSSTND version, that's ok, the
kernel will strip them out.

diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c
index a73dff67a2875f90dd8b94c01dd1f86c8a487c9f..e4255823c652189c5a591fa544837dffdc3cd906 100644 (file)
--- a/citadel/citadel_dirs.c
+++ b/citadel/citadel_dirs.c
@@ -201,15 +201,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",
+                "%s/citadel.key",
                 ctdl_key_dir);
        snprintf(file_crpt_file_csr,
                 sizeof file_crpt_file_csr, 
-                "%scitadel.csr",
+                "%s/citadel.csr",
                 ctdl_key_dir);
        snprintf(file_crpt_file_cer,
                 sizeof file_crpt_file_cer, 
-                "%scitadel.cer",
+                "%s/citadel.cer",
                 ctdl_key_dir);
 
        snprintf(file_chkpwd,

diff --git a/citadel/sysconfig.h b/citadel/sysconfig.h
index e32627c8d80f3064617fe25d7f58677fbef744a6..1be1aa59640715fed20e71f7662af7975e6656d9 100644 (file)
--- a/citadel/sysconfig.h
+++ b/citadel/sysconfig.h
@@ -1,20 +1,6 @@
 /*
  * $Id$
  *
- */
-
-/****************************************************************************/
-/*                  YOUR SYSTEM CONFIGURATION                               */
-/* Set all the values in this file appropriately BEFORE compiling any of the*/
-/* C programs. If you are upgrading from an older version of Citadel, it */
-/* is vitally important that the #defines which are labelled "structure size*/
-/* variables" are EXACTLY the same as they were in your old system,         */
-/* otherwise your files will be munged beyond repair.                       */
-/****************************************************************************/
-
-/* $Id$ */
-
-/*
  * NOTE: this file is for client software tuning, not customization.  For
  * making changes to the behavior of the client, you want to edit citadel.rc,
  * not this file.
@@ -41,8 +27,6 @@
  */
 #define DEFAULT_VERBOSITY      7
 
-
-
 /*
  * NLI is the string that shows up in a <W>ho's online listing for sessions
  * that are active, but for which no user has yet authenticated.
@@ -113,6 +97,7 @@
 #define SYSCONFIGROOM          "Local System Configuration"
 #define SMTP_SPOOLOUT_ROOM     "__CitadelSMTPspoolout__"
 #define FNBL_QUEUE_ROOM                "__CitadelFNBLqueue__"
+
 /*
  * Where we keep messages containing the vCards that source our directory.  It
  * makes no sense to change this, because you'd have to change it on every
@@ -120,21 +105,14 @@
  */
 #define ADDRESS_BOOK_ROOM      "Global Address Book"
 
-
 /*
  * How long (in seconds) to retain message entries in the use table
  */
 #define USETABLE_RETAIN                604800L         /* 7 days */
 
 /*
- * Pathnames for cryptographic goodness
+ * The size of per-thread stacks.  If set too low, citserver will randomly crash.
  */
-/*
-#define        CTDL_CRYPTO_DIR         "./keys"
-#define CTDL_KEY_PATH          CTDL_CRYPTO_DIR "/citadel.key"
-#define CTDL_CSR_PATH          CTDL_CRYPTO_DIR "/citadel.csr"
-#define CTDL_CER_PATH          CTDL_CRYPTO_DIR "/citadel.cer"
-*/
 #define THREADSTACKSIZE                1048576
 
 /*
@@ -142,4 +120,3 @@
  * tables to disk?
  */
 #define FT_MAX_CACHE           2500
-#