* purge ctdlsvc.c

[citadel.git] / citadel / citadel_dirs.c

diff --git a/citadel/citadel_dirs.c b/citadel/citadel_dirs.c
index a1a84ab594055f3e0749b042a67396a79bc7657f..321f00f2b5e3ade4f5ff80e03e3fab338b7dc601 100644 (file)
--- a/citadel/citadel_dirs.c
+++ b/citadel/citadel_dirs.c
@@ -38,7 +38,7 @@ char ctdl_key_dir[PATH_MAX]="keys";
 char ctdl_message_dir[PATH_MAX]="messages";
 char ctdl_usrpic_dir[PATH_MAX]="userpics";
 char ctdl_bbsbase_dir[PATH_MAX]="";
-char ctdl_etc_dir[PATH_MAX]="citadel";
+char ctdl_etc_dir[PATH_MAX]="";
 char ctdl_run_dir[PATH_MAX]="";
 char ctdl_spool_dir[PATH_MAX]="network";
 char ctdl_netout_dir[PATH_MAX]="network/spoolout";
@@ -53,6 +53,10 @@ char file_citadel_rc[PATH_MAX]="";
 char file_citadel_config[PATH_MAX]="";
 char file_lmtp_socket[PATH_MAX]="";
 char file_lmtp_unfiltered_socket[PATH_MAX]="";
+char file_arcq[PATH_MAX]="";
+char file_citadel_socket[PATH_MAX]="";
+char file_mail_aliases[PATH_MAX]="";
+char file_pid_file[PATH_MAX]="";
 
 int home_specified = 0;
 
@@ -79,8 +83,8 @@ int home_specified = 0;
 
 void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdldir)
 {
-       const char* basedir;
-       char dirbuffer[PATH_MAX]="";
+       const char* basedir = "";
+       char dirbuffer[PATH_MAX] = "";
 
        /*
         * Ok, we keep our binaries either in the citadel base dir,
@@ -90,8 +94,8 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
        snprintf(ctdl_sbin_dir, sizeof ctdl_sbin_dir, "/usr/sbin/");
        snprintf(ctdl_bin_dir, sizeof ctdl_bin_dir, "/usr/bin/");
 #else
-       snprintf(ctdl_sbin_dir, sizeof ctdl_sbin_dir, "/usr/sbin");
-       snprintf(ctdl_bin_dir, sizeof ctdl_bin_dir, "/usr/bin");
+       snprintf(ctdl_sbin_dir, sizeof ctdl_sbin_dir, basedir);
+       snprintf(ctdl_bin_dir, sizeof ctdl_bin_dir, basedir);
 #endif
 
 #ifndef HAVE_ETC_DIR
@@ -161,6 +165,34 @@ void calc_dirs_n_files(int relh, int home, const char *relhome,const char  *ctdl
                         "%slmtp-unfiltered.socket",
                         ctdl_run_dir);
 
+       snprintf(file_citadel_socket, 
+                        sizeof file_citadel_socket,
+                               "%scitadel.socket",
+                        ctdl_run_dir);
+       snprintf(file_pid_file, 
+                        sizeof file_pid_file,
+                               "%scitadel.pid",
+                        ctdl_run_dir);
+
+       snprintf(file_arcq, 
+                        sizeof file_arcq,
+                        "%srefcount_adjustments.dat",
+                        ctdl_run_dir);
+
+       /* 
+        * DIRTY HACK FOLLOWS! due to configs in the network dir in the 
+        * legacy installations, we need to calculate ifdeffed here.
+        */
+               snprintf(file_mail_aliases, 
+                                sizeof file_mail_aliases,
+                                "%smail.aliases",
+#ifdef HAVE_ETC_DIR
+                                ctdl_etc_dir
+#else
+                                ctdl_spool_dir
+#endif
+                                );
+
 }