From: Art Cancro <ajc@citadel.org>
Date: Fri, 21 Jul 2023 22:10:57 +0000 (+0000)
Subject: Merge branch 'Memory_Leak_SmtpClient' into 'master'
X-Git-Tag: v984~3
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=bb9560813e47a15af98f21b21b195da9e5858c67;hp=402ee003177c1a52da60a40fc098b305f59f177f;p=citadel.git

Merge branch 'Memory_Leak_SmtpClient' into 'master'

Memory leak in SMTP Client string trim

See merge request citadel/citadel!4
---

diff --git a/citadel/Makefile b/citadel/Makefile
index 87c310158..836362f43 100644
--- a/citadel/Makefile
+++ b/citadel/Makefile
@@ -10,7 +10,7 @@
 # config.mk is generated by ./configure
 include config.mk
 
-all := citserver setup sendcommand citmail chkpw chkpwd ctdldump ctdlload
+all := citserver setup sendcommand citmail chkpw chkpwd
 all: $(all)
 
 SRCDIRS := $(wildcard server server/modules/*)
@@ -50,10 +50,10 @@ chkpwd: utils/chkpwd.c utils/auth.c utils/*.h server/*.h
 	cc ${CFLAGS} ${LDFLAGS} utils/chkpwd.c utils/auth.c -lcrypt -o chkpwd
 
 ctdldump: utils/ctdldump.c utils/*.h server/*.h
-	cc ${CFLAGS} ${LDFLAGS} utils/ctdldump.c -lcitadel -lz -ldb -o ctdldump
+	cc ${CFLAGS} ${LDFLAGS} utils/ctdldump.c -lcitadel -lz -ldb -lpthread -o ctdldump
 
 ctdlload: utils/ctdlload.c server/makeuserkey.c utils/*.h server/*.h
-	cc ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c -lcitadel -lz -ldb -o ctdlload
+	cc ${CFLAGS} ${LDFLAGS} utils/ctdlload.c server/makeuserkey.c -lcitadel -lz -ldb -lpthread -o ctdlload
 
 config.mk: configure
 	./configure
diff --git a/citadel/server/citadel_defs.h b/citadel/server/citadel_defs.h
index 7a6929aaa..a2f666b0b 100644
--- a/citadel/server/citadel_defs.h
+++ b/citadel/server/citadel_defs.h
@@ -21,7 +21,7 @@
 #include "typesize.h"
 #include "ipcdef.h"
 
-#define REV_LEVEL 980		// This version
+#define REV_LEVEL 983		// This version
 #define REV_MIN		591	// Oldest compatible database
 #define EXPORT_REV_MIN	931	// Oldest compatible export files
 #define LIBCITADEL_MIN	951	// Minimum required version of libcitadel
diff --git a/citadel/server/makeuserkey.c b/citadel/server/makeuserkey.c
index 5729034a5..f7f9fd19e 100644
--- a/citadel/server/makeuserkey.c
+++ b/citadel/server/makeuserkey.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <sys/stat.h>
 #include <libcitadel.h>
+#include <string.h>
 #include "config.h"
 #include "user_ops.h"
 
diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index dc96e2bb0..5fab0c5cf 100644
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -19,7 +19,7 @@
 #include <sys/types.h>
 #include <netinet/in.h>
 
-#define LIBCITADEL_VERSION_NUMBER 980
+#define LIBCITADEL_VERSION_NUMBER 983
 
 /*
  * Here's a bunch of stupid magic to make the MIME parser portable.
diff --git a/release_version.txt b/release_version.txt
index da8e2a42b..9f0c87b5f 100644
--- a/release_version.txt
+++ b/release_version.txt
@@ -1 +1 @@
-980
+983
diff --git a/textclient/textclient.h b/textclient/textclient.h
index 4f6730c79..4923ece8e 100644
--- a/textclient/textclient.h
+++ b/textclient/textclient.h
@@ -11,7 +11,7 @@
 #define	UDS			"_UDS_"
 #define DEFAULT_HOST		"localhost"
 #define DEFAULT_PORT		"504"
-#define CLIENT_VERSION 980
+#define CLIENT_VERSION 983
 #define CLIENT_TYPE		0
 
 // commands we can send to the stty_ctdl() routine
diff --git a/webcit/webcit.h b/webcit/webcit.h
index 3d2064989..15c5bca3e 100644
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -127,7 +127,7 @@ extern char *ssl_cipher_list;
 #define PORT_NUM		80			/* port number to listen on */
 #define DEVELOPER_ID		0
 #define CLIENT_ID		4
-#define CLIENT_VERSION 980		/* This version of WebCit */
+#define CLIENT_VERSION 983		/* This version of WebCit */
 #define MINIMUM_CIT_VERSION	931			/* Minimum required version of Citadel server */
 #define	LIBCITADEL_MIN		931			/* Minimum required version of libcitadel */
 #define DEFAULT_CTDLDIR		"/usr/local/citadel"	/* Default Citadel server directory */