From e73e0afde89f43dd19d53c380accb2d1877b03f2 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Fri, 1 Jan 2021 19:59:29 -0500
Subject: [PATCH] Removed calls to chdir() from citserver.  Not needed, and we
 are trying to make the program relocatable.

---
 citadel/config.c | 18 +++++++++---------
 citadel/sysdep.c | 11 +++++------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/citadel/config.c b/citadel/config.c
index 3e9ac8b07..81f93989b 100644
--- a/citadel/config.c
+++ b/citadel/config.c
@@ -1,7 +1,7 @@
 /*
  * Read and write the citadel.config file
  *
- * Copyright (c) 1987-2020 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.
@@ -232,14 +232,14 @@ void initialize_config_system(void) {
 		exit(CTDLEXIT_LIBCITADEL);
 	}
 
-	if (chdir(ctdl_bbsbase_dir) != 0) {
-		fprintf(stderr,
-			"This program could not be started.\nUnable to change directory to %s\nError: %s\n",
-			ctdl_bbsbase_dir,
-			strerror(errno)
-		);
-		exit(CTDLEXIT_HOME);
-	}
+	//if (chdir(ctdl_bbsbase_dir) != 0) {
+		//fprintf(stderr,
+			//"This program could not be started.\nUnable to change directory to %s\nError: %s\n",
+			//ctdl_bbsbase_dir,
+			//strerror(errno)
+		//);
+		//exit(CTDLEXIT_HOME);
+	//}
 
 	memset(&lconfig, 0, sizeof(struct legacy_config));
 	cfp = fopen(file_citadel_config, "rb");
diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 9b1bcfa56..fe8afed30 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -4,7 +4,7 @@
  * Here's where we (hopefully) have most parts of the Citadel server that
  * might need tweaking when run on different operating system variants.
  *
- * Copyright (c) 1987-2019 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.
@@ -946,17 +946,16 @@ void start_daemon(int unused) {
 	pid_t child = 0;
 	FILE *fp;
 	int do_restart = 0;
-
 	current_child = 0;
 
+	//if (chdir(ctdl_run_dir) != 0) {
+		//syslog(LOG_ERR, "%s: %m", ctdl_run_dir);
+	//}
+
 	/* Close stdin/stdout/stderr and replace them with /dev/null.
 	 * We don't just call close() because we don't want these fd's
 	 * to be reused for other files.
 	 */
-	if (chdir(ctdl_run_dir) != 0) {
-		syslog(LOG_ERR, "%s: %m", ctdl_run_dir);
-	}
-
 	child = fork();
 	if (child != 0) {
 		exit(0);
-- 
2.30.2