X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitadel_dirs.h;h=897986d6d5a330c752682df42e790913ea5d271f;hb=973a2dae902c5d7c5f89754d538749bec0de71af;hp=15d6a8a39a2982772a621c28fc416d402de415cd;hpb=4142f26fefd695761522d2d4fd9826c2e33b4cdb;p=citadel.git

diff --git a/citadel/citadel_dirs.h b/citadel/citadel_dirs.h
index 15d6a8a39..897986d6d 100644
--- a/citadel/citadel_dirs.h
+++ b/citadel/citadel_dirs.h
@@ -5,13 +5,13 @@
 
 
 extern char ctdl_home_directory[PATH_MAX];
-extern int home_specified;
 
 
 /* all our directories */
 extern char ctdl_bio_dir[PATH_MAX];
 extern char ctdl_bb_dir[PATH_MAX];
 extern char ctdl_data_dir[PATH_MAX];
+extern char ctdl_dspam_dir[PATH_MAX];
 extern char ctdl_file_dir[PATH_MAX];
 extern char ctdl_hlp_dir[PATH_MAX];
 extern char ctdl_image_dir[PATH_MAX];
@@ -20,6 +20,7 @@ extern char ctdl_key_dir[PATH_MAX];
 extern char ctdl_message_dir[PATH_MAX];
 extern char ctdl_usrpic_dir[PATH_MAX];
 extern char ctdl_etc_dir[PATH_MAX];
+extern char ctdl_autoetc_dir[PATH_MAX];
 extern char ctdl_run_dir[PATH_MAX];
 extern char ctdl_spool_dir[PATH_MAX];
 extern char ctdl_netout_dir[PATH_MAX];
@@ -28,7 +29,8 @@ extern char ctdl_netcfg_dir[PATH_MAX];
 extern char ctdl_bbsbase_dir[PATH_MAX];
 extern char ctdl_sbin_dir[PATH_MAX];
 extern char ctdl_bin_dir[PATH_MAX];
-extern char ctdl_ssl_dir[PATH_MAX];
+extern char ctdl_utilbin_dir[PATH_MAX];
+
 
 
 /* some of the frequently used files */
@@ -41,12 +43,19 @@ extern char file_arcq[PATH_MAX];
 extern char file_citadel_socket[PATH_MAX];
 extern char file_mail_aliases[PATH_MAX];
 extern char file_pid_file[PATH_MAX];
+extern char file_pid_paniclog[PATH_MAX];
 extern char file_crpt_file_key[PATH_MAX];
 extern char file_crpt_file_csr[PATH_MAX];
 extern char file_crpt_file_cer[PATH_MAX];
 extern char file_chkpwd[PATH_MAX];
+extern char file_base64[PATH_MAX];
+extern char file_guesstimezone[PATH_MAX];
+extern char file_dpsam_conf[PATH_MAX];
+extern char file_dspam_log[PATH_MAX];
+
+extern char file_funambol_msg[PATH_MAX];
 
-extern void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdldir);
+extern void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir, int dbg);
 
 
 void assoc_file_name(char *buf, size_t n,