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 e242db80d03287222e1433fb8dc065ddd84e2e85..c7407c4a2a90fdcd3965b8c74248f62c7c0430aa 100644 (file)
--- a/citadel/utillib/citadel_dirs.c
+++ b/citadel/utillib/citadel_dirs.c
@@ -51,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]="";
@@ -197,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",