centralized filename calculation

[citadel.git] / citadel / config.h

diff --git a/citadel/config.h b/citadel/config.h
index 09e0b8be99a028fbc9844efdc1bef6fc996be02a..c9289f96092074de352e705ce8be1c67113367d0 100644 (file)
--- a/citadel/config.h
+++ b/citadel/config.h
@@ -4,7 +4,7 @@
  */
 
 #include "serv_extensions.h"
-
+#include "citadel_dirs.h"
 /* 
  * Global system configuration.
  * 
@@ -67,11 +67,15 @@ struct config {
        int c_pop3s_port;               /* POP3S listener port (usually 995)*/
        int c_smtps_port;               /* SMTPS listener port (usually 465)*/
        char c_auto_cull;               /* Cull db logs automatically?      */
+       char c_instant_expunge;         /* IMAP instant expunge deleted msgs*/
+       char c_allow_spoofing;          /* SMTP allow spoofing of my domains*/
+       char c_journal_email;           /* Perform journaling of email      */
+       char c_journal_pubmsgs;         /* Perform journaling of non-email  */
+       char c_journal_dest[128];       /* Where to send journalized msgs   */
 };
 
 
 void get_config(void);
 void put_config(void);
 extern struct config config;
-extern char ctdl_home_directory[PATH_MAX];
-extern int home_specified;
+