X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Futillib%2Fcitadel_dirs.c;h=a20db278f520e1828f38942e205713962ebfdc12;hb=f614f64351a5df98ebc837c973772cebb8171bd4;hp=2d5dd7b2e6869dc602c3c87489d3d10d822e0b57;hpb=ee841bbc7c5a4ebbcb2a61675a01810ed052919d;p=citadel.git

diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c
index 2d5dd7b2e..a20db278f 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-2017 by the citadel.org team
+ * Copyright (c) 1987-2021 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.
@@ -26,7 +26,6 @@
 
 /* our directories... */
 char ctdl_home_directory[PATH_MAX] = "";
-char ctdl_bio_dir[PATH_MAX]="bio";
 char ctdl_data_dir[PATH_MAX]="data";
 char ctdl_file_dir[PATH_MAX]="files";
 char ctdl_shared_dir[PATH_MAX]="";
@@ -36,13 +35,10 @@ 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]="";
 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 +49,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 +61,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]="";
 
 
@@ -120,9 +114,7 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	basedir=ETC_DIR;
 #endif
 	COMPUTE_DIRECTORY(ctdl_netcfg_dir);
-	COMPUTE_DIRECTORY(ctdl_etc_dir);
 	StripSlashes(ctdl_netcfg_dir, 1);
-	StripSlashes(ctdl_etc_dir, 1);
 
 #ifndef HAVE_UTILBIN_DIR
 	basedir=ctdldir;
@@ -153,7 +145,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 #else
 	basedir=DATA_DIR;
 #endif
-	COMPUTE_DIRECTORY(ctdl_bio_dir);
 	COMPUTE_DIRECTORY(ctdl_data_dir);
 	COMPUTE_DIRECTORY(ctdl_file_dir);
 	COMPUTE_DIRECTORY(ctdl_image_dir);
@@ -161,7 +152,6 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	COMPUTE_DIRECTORY(ctdl_usrpic_dir);
 	COMPUTE_DIRECTORY(ctdl_bbsbase_dir);
 
-	StripSlashes(ctdl_bio_dir, 1);
 	StripSlashes(ctdl_data_dir, 1);
 	StripSlashes(ctdl_file_dir, 1);
 	StripSlashes(ctdl_image_dir, 1);
@@ -175,14 +165,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 +190,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 +240,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",
@@ -276,15 +252,10 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	snprintf(file_mail_aliases, 
 		 sizeof file_mail_aliases,
 		 "%smail.aliases",
-#ifdef HAVE_ETC_DIR
-		 ctdl_etc_dir
-#else
 		 ctdl_spool_dir
-#endif
 		);
 	StripSlashes(file_mail_aliases, 0);
 
-	DBG_PRINT(ctdl_bio_dir);
 	DBG_PRINT(ctdl_data_dir);
 	DBG_PRINT(ctdl_file_dir);
 	DBG_PRINT(ctdl_image_dir);
@@ -292,11 +263,8 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 	DBG_PRINT(ctdl_key_dir);
 	DBG_PRINT(ctdl_message_dir);
 	DBG_PRINT(ctdl_usrpic_dir);
-	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 +285,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);
 }
 
@@ -325,33 +292,27 @@ void calc_dirs_n_files(int relh, int home, const char *relhome, char  *ctdldir,
 /*
  * Generate an associated file name for a room
  */
-size_t assoc_file_name(char *buf, size_t n,
-		     struct ctdlroom *qrbuf, const char *prefix)
-{
+size_t assoc_file_name(char *buf, size_t n, struct ctdlroom *qrbuf, const char *prefix) {
 	return snprintf(buf, n, "%s%ld", prefix, qrbuf->QRnumber);
 }
 
-void remove_digest_file(struct ctdlroom *room)
-{
+
+void remove_digest_file(struct ctdlroom *room) {
 	char buf[PATH_MAX];
 
-	snprintf(buf, PATH_MAX, "%s/%ld.eml", 
-		 ctdl_netdigest_dir,
-		 room->QRnumber);
+	snprintf(buf, PATH_MAX, "%s/%ld.eml", ctdl_netdigest_dir, room->QRnumber);
 	StripSlashes(buf, 0);
 	unlink(buf);
 }
 
-FILE *create_digest_file(struct ctdlroom *room, int forceCreate)
-{
+
+FILE *create_digest_file(struct ctdlroom *room, int forceCreate) {
 	struct stat stbuf;
 	char fn[PATH_MAX];
 	int exists;
 	FILE *fp;
 
-	snprintf(fn, PATH_MAX, "%s/%ld.eml", 
-		 ctdl_netdigest_dir,
-		 room->QRnumber);
+	snprintf(fn, PATH_MAX, "%s/%ld.eml", ctdl_netdigest_dir, room->QRnumber);
 	StripSlashes(fn, 0);
 
 	exists = stat(fn, &stbuf); 
@@ -360,21 +321,17 @@ FILE *create_digest_file(struct ctdlroom *room, int forceCreate)
 	
 	fp = fopen(fn, "w+");
 	if (fp == NULL) {
-		syslog(LOG_EMERG,
-		       "failed to create digest file %s: %s",
-		       fn,
-		       strerror(errno));
+		syslog(LOG_ERR, "failed to create digest file %s: %s", fn, strerror(errno));
 	}
 	return fp;
 }
 
 
-int create_dir(char *which, long ACCESS, long UID, long GID)
-{
+int create_dir(char *which, long ACCESS, long UID, long GID) {
 	int rv;
 	rv = mkdir(which, ACCESS);
 	if ((rv == -1) && (errno != EEXIST)) {
-		syslog(LOG_EMERG,
+		syslog(LOG_ERR,
 		       "failed to create directory %s: %s",
 		       which,
 		       strerror(errno));
@@ -382,7 +339,7 @@ int create_dir(char *which, long ACCESS, long UID, long GID)
 	}
 	rv = chmod(which, ACCESS);
 	if (rv == -1) {
-		syslog(LOG_EMERG,
+		syslog(LOG_ERR,
 		       "failed to set permissions for directory %s: %s",
 		       which,
 		       strerror(errno));
@@ -390,7 +347,7 @@ int create_dir(char *which, long ACCESS, long UID, long GID)
 	}
 	rv = chown(which, UID, GID);
 	if (rv == -1) {
-		syslog(LOG_EMERG,
+		syslog(LOG_ERR,
 		       "failed to set owner for directory %s: %s",
 		       which,
 		       strerror(errno));
@@ -399,14 +356,12 @@ int create_dir(char *which, long ACCESS, long UID, long GID)
 	return rv;
 }
 
-int create_run_directories(long UID, long GID)
-{
+
+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_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);