From 1e99d3eab849c3c41341d2d9b055ea7ee6a058a3 Mon Sep 17 00:00:00 2001
From: Art Cancro <ajc@citadel.org>
Date: Sun, 6 Dec 2020 15:24:24 -0500
Subject: [PATCH] Removed extra references to thread keys that are not extern

---
 citadel/threads.h      | 2 +-
 libcitadel/Makefile.in | 1 +
 webcit/context_loop.c  | 1 -
 webcit/webserver.c     | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/citadel/threads.h b/citadel/threads.h
index 5540d27a8..33b854ea9 100644
--- a/citadel/threads.h
+++ b/citadel/threads.h
@@ -24,7 +24,7 @@ struct thread_tsd {
 	DBC *cursors[MAXCDB];   /* Cursors, for traversals... */
 };
 
-pthread_key_t ThreadKey;
+extern pthread_key_t ThreadKey;
 extern struct thread_tsd masterTSD;
 #define TSD MyThread()
 
diff --git a/libcitadel/Makefile.in b/libcitadel/Makefile.in
index 5aa222352..e4f4ec476 100755
--- a/libcitadel/Makefile.in
+++ b/libcitadel/Makefile.in
@@ -79,6 +79,7 @@ install: $(LIBRARY) $(APIHEADER) install-pkgconfigDATA
 	$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir)
 	$(LIBTOOL) --mode=install $(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(LIBRARY)
 	for FN in $(APIHEADER) ; do $(INSTALL_DATA) $$FN $(DESTDIR)$(includedir) ; done
+	ldconfig || true
 
 uninstall:
 	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(LIBRARY)
diff --git a/webcit/context_loop.c b/webcit/context_loop.c
index f02a61991..5a0730297 100644
--- a/webcit/context_loop.c
+++ b/webcit/context_loop.c
@@ -24,7 +24,6 @@ pthread_mutex_t SessionListMutex;
 
 wcsession *SessionList = NULL;	/* Linked list of all webcit sessions */
 
-pthread_key_t MyConKey;         /* TSD key for MySession() */
 HashList *HttpReqTypes = NULL;
 HashList *HttpHeaderHandler = NULL;
 extern HashList *HandlerHash;
diff --git a/webcit/webserver.c b/webcit/webserver.c
index 24fd56021..636c7a706 100644
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -22,7 +22,6 @@ int follow_xff = 0;				/* Follow X-Forwarded-For: header? */
 int DisableGzip = 0;
 char *default_landing_page = NULL;
 extern pthread_mutex_t SessionListMutex;
-extern pthread_key_t MyConKey;
 
 extern void *housekeeping_loop(void);
 extern int webcit_tcp_server(char *ip_addr, int port_number, int queue_len);
-- 
2.30.2