char ctdl_hlp_dir[PATH_MAX]="help";
char ctdl_image_dir[PATH_MAX]="images";
char ctdl_info_dir[PATH_MAX]="info";
-char ctdl_key_dir[PATH_MAX]="keys";
+char ctdl_key_dir[PATH_MAX]=SSL_DIR;
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]="";
+/* 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_netcfg_dir[PATH_MAX]="netconfigs";
-char ctdl_sbin_dir[PATH_MAX];
-char ctdl_bin_dir[PATH_MAX];
+char ctdl_utilbin_dir[PATH_MAX]="";
+char ctdl_sbin_dir[PATH_MAX]="";
+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_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]="";
+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]="";
int home_specified = 0;
COMPUTE_DIRECTORY(ctdl_netcfg_dir);
COMPUTE_DIRECTORY(ctdl_etc_dir);
+#ifndef HAVE_UTILBIN_DIR
+ basedir=ctdldir;
+#else
+ basedir=UTILBIN_DIR;
+#endif
+ COMPUTE_DIRECTORY(ctdl_utilbin_dir);
+
#ifndef HAVE_RUN_DIR
basedir=ctdldir;
#else
#endif
COMPUTE_DIRECTORY(ctdl_run_dir);
+#ifndef HAVE_STATICDATA_DIR
+ basedir=ctdldir;
+#else
+ basedir=STATICDATA_DIR;
+#endif
+ COMPUTE_DIRECTORY(ctdl_hlp_dir);
+ COMPUTE_DIRECTORY(ctdl_message_dir);
+
#ifndef HAVE_DATA_DIR
basedir=ctdldir;
#else
COMPUTE_DIRECTORY(ctdl_bb_dir);
COMPUTE_DIRECTORY(ctdl_data_dir);
COMPUTE_DIRECTORY(ctdl_file_dir);
- COMPUTE_DIRECTORY(ctdl_hlp_dir);
COMPUTE_DIRECTORY(ctdl_image_dir);
COMPUTE_DIRECTORY(ctdl_info_dir);
- COMPUTE_DIRECTORY(ctdl_message_dir);
COMPUTE_DIRECTORY(ctdl_usrpic_dir);
COMPUTE_DIRECTORY(ctdl_bbsbase_dir);
#ifndef HAVE_SPOOL_DIR
/* ok, now we know the dirs, calc some commonly used files */
+ snprintf(file_arcq,
+ sizeof file_arcq,
+ "%srefcount_adjustments.dat",
+ ctdl_etc_dir);
+
snprintf(file_citadel_control,
sizeof file_citadel_control,
"%scitadel.control",
"%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_crpt_file_key,
+ sizeof file_crpt_file_key,
+ "%s/citadel.key",
+ ctdl_key_dir);
+ snprintf(file_crpt_file_csr,
+ sizeof file_crpt_file_csr,
+ "%s/citadel.csr",
+ ctdl_key_dir);
+ snprintf(file_crpt_file_cer,
+ sizeof file_crpt_file_cer,
+ "%s/citadel.cer",
+ ctdl_key_dir);
+
+ snprintf(file_chkpwd,
+ sizeof file_chkpwd,
+ "%schkpwd",
+ ctdl_sbin_dir);
+
+ snprintf(file_base64,
+ sizeof file_chkpwd,
+ "%sbase64",
+ ctdl_utilbin_dir);
+
/*
* DIRTY HACK FOLLOWS! due to configs in the network dir in the