war on lfhs continues ... what a mess

diff --git a/citadel/bootstrap b/citadel/bootstrap
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/citadel/citadel_dirs.h b/citadel/citadel_dirs.h
index 47f0c2d7e77a86a99d94a9a4f097cf1abf9a03bb..7288f25ae729c13747feb3c1e1311e19f1878bc5 100644 (file)
--- a/citadel/citadel_dirs.h
+++ b/citadel/citadel_dirs.h
@@ -3,39 +3,39 @@
 
 #include <limits.h>
 
-/* all our directories */
-extern char *ctdl_home_directory;
-extern char *ctdl_db_dir;
-extern char *ctdl_file_dir;
-extern char *ctdl_shared_dir;
-extern char *ctdl_image_dir;
-extern char *ctdl_info_dir;
-extern char *ctdl_key_dir;
-extern char *ctdl_message_dir;
-extern char *ctdl_usrpic_dir;
-extern char *ctdl_autoetc_dir;
-extern char *ctdl_run_dir;
-extern char *ctdl_netdigest_dir;
-extern char *ctdl_netcfg_dir;
-extern char *ctdl_bbsbase_dir;
-extern char *ctdl_sbin_dir;
-extern char *ctdl_bin_dir;
-extern char *ctdl_utilbin_dir;
+/* Fixed directory names (some of these are obsolete and used only for migration) */
+#define ctdl_home_directory    "."
+#define ctdl_db_dir            "data"
+#define ctdl_file_dir          "files"
+#define ctdl_shared_dir                "."
+#define ctdl_image_dir         "images"
+#define ctdl_info_dir          "info"
+#define ctdl_key_dir           "keys"
+#define ctdl_message_dir       "messages"
+#define ctdl_usrpic_dir                "userpics"
+#define ctdl_autoetc_dir       "."
+#define ctdl_run_dir           "."
+#define ctdl_netcfg_dir                "netconfigs"
+#define ctdl_bbsbase_dir       "."
+#define ctdl_sbin_dir          "."
+#define ctdl_bin_dir           "."
+#define ctdl_utilbin_dir       "."
+
+/* Fixed file names (some of these are obsolete and used only for migration) */
+#define file_citadel_config            "citadel.config"
+#define file_lmtp_socket               "lmtp.socket"
+#define file_lmtp_unfiltered_socket    "lmtp-unfiltered.socket"
+#define file_arcq                      "refcount_adjustments.dat"
+#define file_citadel_socket            "citadel.socket"
+#define file_citadel_admin_socket      "citadel-admin.socket"
+#define file_pid_file                  "/var/run/citserver.pid"
+#define file_pid_paniclog              "panic.log"
+#define file_crpt_file_key             "keys/citadel.key"
+#define file_crpt_file_csr             "keys/citadel.csr"
+#define file_crpt_file_cer             "keys/citadel.cer"
+#define file_chkpwd                    "chkpwd"
+#define file_guesstimezone             "guesstimezone.sh"
 
-/* some of the frequently used files */
-extern char *file_citadel_config;
-extern char *file_lmtp_socket;
-extern char *file_lmtp_unfiltered_socket;
-extern char *file_arcq;
-extern char *file_citadel_socket;
-extern char *file_citadel_admin_socket;
-extern char *file_pid_file;
-extern char *file_pid_paniclog;
-extern char *file_crpt_file_key;
-extern char *file_crpt_file_csr;
-extern char *file_crpt_file_cer;
-extern char *file_chkpwd;
-extern char *file_guesstimezone;
 
 /* externs */
 extern int create_run_directories(long UID, long GUID);

diff --git a/citadel/netconfig.c b/citadel/netconfig.c
index d72381837c504f34cb7d4fe8aede1be0a7e72166..de180074baf612300e8e58d3306b6c47c848e5b6 100644 (file)
--- a/citadel/netconfig.c
+++ b/citadel/netconfig.c
@@ -1,7 +1,7 @@
 /*
  * This module handles loading, saving, and parsing of room network configurations.
  *
- * Copyright (c) 2000-2018 by the citadel.org team
+ * Copyright (c) 2000-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.
@@ -30,7 +30,7 @@
 
 #include <libcitadel.h>
 
-#include "include/ctdl_module.h"
+#include "ctdl_module.h"
 #include "serv_extensions.h"
 #include "config.h"
 

diff --git a/citadel/utillib/citadel_dirs.c b/citadel/utillib/citadel_dirs.c
index 3bcff6e399439d532226b8e1dcedf6271284146a..f1fb3e9a632c1726f3db9c2e32ed03996219a3d7 100644 (file)
--- a/citadel/utillib/citadel_dirs.c
+++ b/citadel/utillib/citadel_dirs.c
@@ -24,40 +24,6 @@
 #include "citadel.h"
 #include "citadel_dirs.h"
 
-/* all our directories */
-char *ctdl_home_directory = ".";
-char *ctdl_db_dir = "data";
-char *ctdl_file_dir = "files";
-char *ctdl_shared_dir = ".";
-char *ctdl_image_dir = "images";
-char *ctdl_info_dir = "info";
-char *ctdl_key_dir = "keys";
-char *ctdl_message_dir = "messages";
-char *ctdl_usrpic_dir = "userpics";
-char *ctdl_autoetc_dir = ".";
-char *ctdl_run_dir = ".";
-char *ctdl_netcfg_dir = "netconfigs";
-char *ctdl_bbsbase_dir = ".";
-char *ctdl_sbin_dir = ".";
-char *ctdl_bin_dir = ".";
-char *ctdl_utilbin_dir = ".";
-
-/* some of the frequently used files */
-char *file_citadel_config = "citadel.config";
-char *file_lmtp_socket = "lmtp.socket";
-char *file_lmtp_unfiltered_socket = "lmtp-unfiltered.socket";
-char *file_arcq = "refcount_adjustments.dat";
-char *file_citadel_socket = "citadel.socket";
-char *file_citadel_admin_socket = "citadel-admin.socket";
-char *file_pid_file = "/var/run/citserver.pid";
-char *file_pid_paniclog = "panic.log";
-char *file_crpt_file_key = "keys/citadel.key";
-char *file_crpt_file_csr = "keys/citadel.csr";
-char *file_crpt_file_cer = "keys/citadel.cer";
-char *file_chkpwd = "chkpwd";
-char *file_guesstimezone = "guesstimezone.sh";
-
-
 /*
  * Generate an associated file name for a room
  */

diff --git a/citadel/utils/sendcommand.c b/citadel/utils/sendcommand.c
index b6c9102483ede828940b41a872fb5d0bfafed810..a77c8a8eb4ef390ff401ae468a8699d01e2ec659 100644 (file)
--- a/citadel/utils/sendcommand.c
+++ b/citadel/utils/sendcommand.c
@@ -27,7 +27,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include "citadel.h"
-#include "include/citadel_dirs.h"
+#include "citadel_dirs.h"
 #include <libcitadel.h>
 
 int serv_sock = (-1);