X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futillib%2Fcitadel_dirs.c;h=2d5dd7b2e6869dc602c3c87489d3d10d822e0b57;hb=ee841bbc7c5a4ebbcb2a61675a01810ed052919d;hp=dc74da406ec70ad977b5bb33fbf8f535af5444e9;hpb=f497f052e1b5d08e98bd539de162a2441436df8e;p=citadel.git

diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c
index dc74da406..2d5dd7b2e 100644
--- a/citadel/utillib/citadel_dirs.c
+++ b/citadel/utillib/citadel_dirs.c
@@ -1,7 +1,7 @@
 /*
  * citadel_dirs.c : calculate pathnames for various files used in the Citadel system
  *
- * Copyright (c) 1987-2016 by the citadel.org team
+ * Copyright (c) 1987-2017 by the citadel.org team
  *
  *  This program is open source software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 3.
@@ -27,11 +27,8 @@
 /* our directories... */
 char ctdl_home_directory[PATH_MAX] = "";
 char ctdl_bio_dir[PATH_MAX]="bio";
-char ctdl_bb_dir[PATH_MAX]="bitbucket";
 char ctdl_data_dir[PATH_MAX]="data";
-char ctdl_dspam_dir[PATH_MAX]="dspam";
 char ctdl_file_dir[PATH_MAX]="files";
-char ctdl_hlp_dir[PATH_MAX]="help";
 char ctdl_shared_dir[PATH_MAX]="";
 char ctdl_image_dir[PATH_MAX]="images";
 char ctdl_info_dir[PATH_MAX]="info";
@@ -71,9 +68,6 @@ char file_crpt_file_cer[PATH_MAX]="";
 char file_chkpwd[PATH_MAX]="";
 char file_base64[PATH_MAX]="";
 char file_guesstimezone[PATH_MAX]="";
-char file_funambol_msg[PATH_MAX] = "";
-char file_dpsam_conf[PATH_MAX] = "";
-char file_dspam_log[PATH_MAX] = "";
 
 
 
@@ -154,25 +148,13 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	COMPUTE_DIRECTORY(ctdl_message_dir);
 	StripSlashes(ctdl_message_dir, 1);
 
-#ifndef HAVE_HELP_DIR
-	basedir=ctdldir;
-#else
-	basedir=HELP_DIR;
-#endif
-	COMPUTE_DIRECTORY(ctdl_hlp_dir);
-	StripSlashes(ctdl_hlp_dir, 1);
-	COMPUTE_DIRECTORY(ctdl_shared_dir);
-	StripSlashes(ctdl_shared_dir, 1);
-
 #ifndef HAVE_DATA_DIR
 	basedir=ctdldir;
 #else
 	basedir=DATA_DIR;
 #endif
 	COMPUTE_DIRECTORY(ctdl_bio_dir);
-	COMPUTE_DIRECTORY(ctdl_bb_dir);
 	COMPUTE_DIRECTORY(ctdl_data_dir);
-	COMPUTE_DIRECTORY(ctdl_dspam_dir);
 	COMPUTE_DIRECTORY(ctdl_file_dir);
 	COMPUTE_DIRECTORY(ctdl_image_dir);
 	COMPUTE_DIRECTORY(ctdl_info_dir);
@@ -180,9 +162,7 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	COMPUTE_DIRECTORY(ctdl_bbsbase_dir);
 
 	StripSlashes(ctdl_bio_dir, 1);
-	StripSlashes(ctdl_bb_dir, 1);
 	StripSlashes(ctdl_data_dir, 1);
-	StripSlashes(ctdl_dspam_dir, 1);
 	StripSlashes(ctdl_file_dir, 1);
 	StripSlashes(ctdl_image_dir, 1);
 	StripSlashes(ctdl_info_dir, 1);
@@ -289,16 +269,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 		 "%sguesstimezone.sh",
 		 ctdl_utilbin_dir);
 
-	snprintf(file_dpsam_conf,
-		 sizeof file_dpsam_conf,
-		 "%sdspam.conf",
-		 ctdl_etc_dir);
-	StripSlashes(file_dpsam_conf, 0);
-	snprintf(file_dspam_log, 
-		 sizeof file_dspam_log, 
-		 "%sdspam.log",
-		 ctdl_home_directory);
-	StripSlashes(file_dspam_log, 0);
 	/* 
 	 * DIRTY HACK FOLLOWS! due to configs in the network dir in the 
 	 * legacy installations, we need to calculate ifdeffed here.
@@ -313,18 +283,10 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 #endif
 		);
 	StripSlashes(file_mail_aliases, 0);
-        snprintf(file_funambol_msg,
-                sizeof file_funambol_msg,
-                "%sfunambol_newmail_soap.xml",
-                ctdl_shared_dir);
-	StripSlashes(file_funambol_msg, 0);
 
 	DBG_PRINT(ctdl_bio_dir);
-	DBG_PRINT(ctdl_bb_dir);
 	DBG_PRINT(ctdl_data_dir);
-	DBG_PRINT(ctdl_dspam_dir);
 	DBG_PRINT(ctdl_file_dir);
-	DBG_PRINT(ctdl_hlp_dir);
 	DBG_PRINT(ctdl_image_dir);
 	DBG_PRINT(ctdl_info_dir);
 	DBG_PRINT(ctdl_key_dir);
@@ -357,7 +319,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	DBG_PRINT(file_chkpwd);
 	DBG_PRINT(file_base64);
 	DBG_PRINT(file_guesstimezone);
-	DBG_PRINT(file_funambol_msg);
 }
 
 
@@ -442,8 +403,6 @@ int create_run_directories(long UID, long GID)
 {
 	int rv = 0;
 	rv += create_dir(ctdl_message_dir   , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
-	rv += create_dir(ctdl_hlp_dir       , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
-	rv += create_dir(ctdl_bb_dir        , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
 	rv += create_dir(ctdl_file_dir      , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
 	rv += create_dir(ctdl_spool_dir     , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
 	rv += create_dir(ctdl_netout_dir    , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);