From 726b17052194381cb213317808ccba1f41194285 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Sat, 8 May 2021 18:24:12 -0400
Subject: [PATCH] Removed the backtrace stuff.  It wasn't producing traces that
 were useful.

---
 appimage/ctdlvisor.c  |  4 +---
 citadel/citserver.c   |  1 -
 citadel/citserver.h   |  1 -
 citadel/server_main.c |  6 +-----
 citadel/sysdep.c      | 29 +----------------------------
 5 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/appimage/ctdlvisor.c b/appimage/ctdlvisor.c
index c7a073a70..6784f2cc5 100644
--- a/appimage/ctdlvisor.c
+++ b/appimage/ctdlvisor.c
@@ -96,14 +96,12 @@ void detach_from_tty(void) {
 
 pid_t start_citadel() {
 	char bin[1024];
-	char backtrace_filename[PATH_MAX];
 	sprintf(bin, "%s/usr/local/citadel/citserver", getenv("APPDIR"));
 	pid_t pid = fork();
 	if (pid == 0) {
 		fprintf(stderr, "ctdlvisor: executing %s with data directory %s\n", bin, getenv("CTDL_DIR"));
 		detach_from_tty();
-		sprintf(backtrace_filename, "/tmp/citserver-backtrace.%d", getpid());
-		execlp(bin, "citserver", "-x9", "-h", getenv("CTDL_DIR"), "-b", backtrace_filename, NULL);
+		execlp(bin, "citserver", "-x9", "-h", getenv("CTDL_DIR"), NULL);
 		exit(errno);
 	}
 	else {
diff --git a/citadel/citserver.c b/citadel/citserver.c
index 48c4f5ac2..cde79e0f6 100644
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -33,7 +33,6 @@ int ScheduledShutdown = 0;
 time_t server_startup_time;
 int panic_fd;
 int openid_level_supported = 0;
-char *backtrace_filename = NULL;
 
 
 /*
diff --git a/citadel/citserver.h b/citadel/citserver.h
index a702e089e..adfe476c1 100644
--- a/citadel/citserver.h
+++ b/citadel/citserver.h
@@ -51,4 +51,3 @@ extern int panic_fd;
 char CtdlCheckExpress(void);
 extern time_t server_startup_time;
 extern int openid_level_supported;
-extern char *backtrace_filename;
diff --git a/citadel/server_main.c b/citadel/server_main.c
index 33fdc33bc..4e6ca9627 100644
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -100,7 +100,7 @@ int main(int argc, char **argv) {
 	syslog(LOG_INFO, "%s", libcitadel_version_string());
 
 	/* parse command-line arguments */
-	while ((a=getopt(argc, argv, "cl:dh:x:t:B:Dru:s:b:")) != EOF) switch(a) {
+	while ((a=getopt(argc, argv, "cl:dh:x:t:B:Dru:s:")) != EOF) switch(a) {
 
 		// test this binary for compatibility and exit
 		case 'c':
@@ -169,10 +169,6 @@ int main(int argc, char **argv) {
 			sanity_diag_mode = atoi(optarg);
 			break;
 
-		case 'b':
-			backtrace_filename = strdup(optarg);
-			break;
-
 		// any other parameter makes it crash and burn
 		default:
 			fprintf(stderr,	"citserver: usage: "
diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 3caa2dcfc..31ece9856 100644
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -49,32 +49,7 @@ volatile int running_as_daemon = 0;
 
 
 static RETSIGTYPE signal_cleanup(int signum) {
-	syslog(LOG_DEBUG, "sysdep: caught signal %d - backtrace follows:", signum);
-
-	void *bt[1024];
-	int bt_size;
-	char **bt_syms;
-	int i;
-	FILE *backtrace_fp = NULL;
-
-	if (backtrace_filename != NULL) {
-		backtrace_fp = fopen(backtrace_filename, "w");
-	}
-
-	bt_size = backtrace(bt, 1024);
-	bt_syms = backtrace_symbols(bt, bt_size);
-	for (i = 1; i < bt_size; i++) {
-		syslog(LOG_DEBUG, "%s", bt_syms[i]);
-		if (backtrace_fp) {
-			fprintf(backtrace_fp, "%s\n", bt_syms[i]);
-		}
-	}
-	free(bt_syms);
-
-	if (backtrace_fp) {
-		fclose(backtrace_fp);
-	}
-
+	syslog(LOG_DEBUG, "sysdep: caught signal %d", signum);
 	exit_signal = signum;
 	server_shutting_down = 1;
 }
@@ -115,13 +90,11 @@ void init_sysdep(void) {
 	sigaddset(&set, SIGINT);
 	sigaddset(&set, SIGHUP);
 	sigaddset(&set, SIGTERM);
-	sigaddset(&set, SIGSEGV);
 	sigprocmask(SIG_UNBLOCK, &set, NULL);
 
 	signal(SIGINT, signal_cleanup);
 	signal(SIGHUP, signal_cleanup);
 	signal(SIGTERM, signal_cleanup);
-	signal(SIGSEGV, signal_cleanup);
 
 	// Do not shut down the server on broken pipe signals, otherwise the
 	// whole Citadel service would come down whenever a single client
-- 
2.30.2