X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futillib%2Fcitadel_dirs.c;h=e242db80d03287222e1433fb8dc065ddd84e2e85;hb=43a89745e7dd300cc0f0abe9239126de5edea8e3;hp=7a4c70534edff8c7c4b7ff2097def8194db6f619;hpb=1e9d2ef0202aa02d95ba5f15899cdce6434cee48;p=citadel.git

diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c
index 7a4c70534..e242db80d 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-2018 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,9 +27,7 @@
 /* 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_shared_dir[PATH_MAX]="";
 char ctdl_image_dir[PATH_MAX]="images";
@@ -43,8 +41,6 @@ char ctdl_autoetc_dir[PATH_MAX]="";
 /* attention! this may be non volatile on some oses */
 char ctdl_run_dir[PATH_MAX]="";
 char ctdl_spool_dir[PATH_MAX]="network";
-char ctdl_netout_dir[PATH_MAX]="network/spoolout";
-char ctdl_netin_dir[PATH_MAX]="network/spoolin";
 char ctdl_netdigest_dir[PATH_MAX]="network/digest";
 char ctdl_nettmp_dir[PATH_MAX]="network/spooltmp";
 char ctdl_netcfg_dir[PATH_MAX]="netconfigs";
@@ -68,11 +64,7 @@ char file_crpt_file_key[PATH_MAX]="";
 char file_crpt_file_csr[PATH_MAX]="";
 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] = "";
 
 
 
@@ -159,9 +151,7 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	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);
@@ -169,9 +159,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);
@@ -184,14 +172,10 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	basedir=SPOOL_DIR;
 #endif
 	COMPUTE_DIRECTORY(ctdl_spool_dir);
-	COMPUTE_DIRECTORY(ctdl_netout_dir);
-	COMPUTE_DIRECTORY(ctdl_netin_dir);
 	COMPUTE_DIRECTORY(ctdl_netdigest_dir);
 	COMPUTE_DIRECTORY(ctdl_nettmp_dir);
 
 	StripSlashes(ctdl_spool_dir, 1);
-	StripSlashes(ctdl_netout_dir, 1);
-	StripSlashes(ctdl_netin_dir, 1);
 	StripSlashes(ctdl_netdigest_dir, 1);
 	StripSlashes(ctdl_nettmp_dir, 1);
 
@@ -268,26 +252,11 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 		 "%schkpwd",
 		 ctdl_utilbin_dir);
 	StripSlashes(file_chkpwd, 0);
-	snprintf(file_base64,
-		 sizeof file_base64,
-		 "%sbase64",
-		 ctdl_utilbin_dir);
-	StripSlashes(file_base64, 0);
 	snprintf(file_guesstimezone,
 		 sizeof file_guesstimezone,
 		 "%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.
@@ -302,16 +271,9 @@ 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_image_dir);
 	DBG_PRINT(ctdl_info_dir);
@@ -321,8 +283,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	DBG_PRINT(ctdl_etc_dir);
 	DBG_PRINT(ctdl_run_dir);
 	DBG_PRINT(ctdl_spool_dir);
-	DBG_PRINT(ctdl_netout_dir);
-	DBG_PRINT(ctdl_netin_dir);
 	DBG_PRINT(ctdl_netdigest_dir);
 	DBG_PRINT(ctdl_nettmp_dir);
 	DBG_PRINT(ctdl_netcfg_dir);
@@ -343,9 +303,7 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	DBG_PRINT(file_crpt_file_csr);
 	DBG_PRINT(file_crpt_file_cer);
 	DBG_PRINT(file_chkpwd);
-	DBG_PRINT(file_base64);
 	DBG_PRINT(file_guesstimezone);
-	DBG_PRINT(file_funambol_msg);
 }
 
 
@@ -430,11 +388,8 @@ 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_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);
-	rv += create_dir(ctdl_netin_dir     , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
 	rv += create_dir(ctdl_netdigest_dir , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
 	rv += create_dir(ctdl_nettmp_dir    , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);
 	rv += create_dir(ctdl_key_dir       , S_IRUSR|S_IWUSR|S_IXUSR, UID, -1);