From fe70bc8314205d9c32da7c73e5bf1c58ee1a67f6 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Fri, 23 Apr 2021 17:59:51 -0400
Subject: [PATCH] Removed exit code definitions that are no longer used

---
 appimage/ctdlvisor.c | 17 ++++++-----------
 citadel/Makefile.in  |  4 ++--
 citadel/server.h     |  2 --
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/appimage/ctdlvisor.c b/appimage/ctdlvisor.c
index 7e2c25b29..6784f2cc5 100644
--- a/appimage/ctdlvisor.c
+++ b/appimage/ctdlvisor.c
@@ -71,15 +71,7 @@ void signal_handler(int signal) {
 			what_exited = "unknown";
 		}
 		if (who_exited >= 0) {
-			if (WIFEXITED(status)) {
-				fprintf(stderr, "ctdlvisor: %d (%s) exited, exitcode=%d\n", who_exited, what_exited, WEXITSTATUS(status));
-			}
-			else if (WIFSIGNALED(status)) {
-				fprintf(stderr, "ctdlvisor: %d (%s) crashed, signal=%d\n", who_exited, what_exited, WTERMSIG(status));
-			}
-			else {
-				fprintf(stderr, "ctdlvisor: %d (%s) ended, status=%d\n", who_exited, what_exited, status);
-			}
+			fprintf(stderr, "ctdlvisor: %d (%s) ended, status=%d\n", who_exited, what_exited, status);
 		}
 	} while (who_exited >= 0);
 	ctdlvisor_exit(0);
@@ -170,19 +162,22 @@ void main_loop(void) {
 		// If it crashes, however, we will start it back up.
 		if (who_exited == citserver_pid) {
 			citserver_exit_code = WEXITSTATUS(status);
-			if (citserver_exit_code == 0) {
+			if ((WIFEXITED(status)) && (citserver_exit_code == 0)) {
 				fprintf(stderr, "ctdlvisor: citserver exited normally - ending AppImage session\n");
 				shutting_down = 1;
 				kill(webcit_pid, SIGTERM);
 				kill(webcits_pid, SIGTERM);
 			}
-			else if ((citserver_exit_code >= 101) && (citserver_exit_code <= 109)) {
+			else if ((WIFEXITED(status)) && (citserver_exit_code >= 101) && (citserver_exit_code <= 109)) {
 				fprintf(stderr, "ctdlvisor: citserver exited intentionally - ending AppImage session\n");
 				shutting_down = 1;
 				kill(webcit_pid, SIGTERM);
 				kill(webcits_pid, SIGTERM);
 			}
 			else {
+				if (WIFSIGNALED(status)) {
+					fprintf(stderr, "ctdlvisor: citserver crashed on signal %d\n", WTERMSIG(status));
+				}
 				citserver_pid = start_citadel();
 			}
 		}
diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index bf475dabd..83d2bcb1c 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -48,14 +48,14 @@ CFLAGS=@CFLAGS@ -I.
 CPPFLAGS=@CPPFLAGS@ -I.
 DATABASE=@DATABASE@
 DEFS=@DEFS@ -DDIFF=\"@DIFF@\" -DPATCH=\"@PATCH@\"
-LDFLAGS=@LDFLAGS@
+LDFLAGS=@LDFLAGS@ -rdynamic
 LIBS=@LIBS@
 LIBOBJS=@LIBOBJS@
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 RESOLV=@RESOLV@
 SHELL=/bin/sh
-SERVER_LDFLAGS=@SERVER_LDFLAGS@
+SERVER_LDFLAGS=@SERVER_LDFLAGS@ -rdynamic
 SERVER_LIBS=@SERVER_LIBS@
 SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
diff --git a/citadel/server.h b/citadel/server.h
index 0be145a20..ef7b4aa84 100644
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -72,9 +72,7 @@ struct recptypes {
  * restart.
  */
 #define CTDLEXIT_CONFIG		101	// Could not read system configuration
-#define CTDLEXIT_CONTROL	102	// Could not acquire lock
 #define CTDLEXIT_HOME		103	// Citadel home directory not found
-#define CTDLEXIT_OOD		104	// Out Of Date config - rerun setup
 #define CTDLEXIT_DB		105	// Unable to initialize database
 #define CTDLEXIT_LIBCITADEL	106	// Incorrect version of libcitadel
 #define CTDL_EXIT_UNSUP_AUTH	107	// Unsupported auth mode configured
-- 
2.30.2