Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

[citadel.git] / citadel / utillib / citadel_dirs.c

diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c
index 2d5dd7b2e6869dc602c3c87489d3d10d822e0b57..c7407c4a2a90fdcd3965b8c74248f62c7c0430aa 100644 (file)
--- 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-2017 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.
@@ -41,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";
@@ -53,7 +51,6 @@ char ctdl_bin_dir[PATH_MAX]="";
 /* some of our files, that are needed in several places */
 char file_citadel_control[PATH_MAX]="";
 char file_citadel_config[PATH_MAX]="";
-char file_citadel_urlshorteners[PATH_MAX]="";
 char file_lmtp_socket[PATH_MAX]="";
 char file_lmtp_unfiltered_socket[PATH_MAX]="";
 char file_arcq[PATH_MAX]="";
@@ -66,7 +63,6 @@ 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]="";
 
 
@@ -175,14 +171,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);
 
@@ -204,11 +196,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
                         "%scitadel.config",
                         ctdl_autoetc_dir);
        StripSlashes(file_citadel_config, 0);
-       snprintf(file_citadel_urlshorteners, 
-                        sizeof file_citadel_urlshorteners,
-                        "%scitadel_urlshorteners.rc",
-                        ctdl_etc_dir);
-       StripSlashes(file_citadel_urlshorteners, 0);
        snprintf(file_lmtp_socket, 
                         sizeof file_lmtp_socket,
                         "%slmtp.socket",
@@ -259,11 +246,6 @@ 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",
@@ -295,8 +277,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);
@@ -317,7 +297,6 @@ 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);
 }
 
@@ -405,8 +384,6 @@ int create_run_directories(long UID, long GID)
        rv += create_dir(ctdl_message_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);