From 8e60f37d49c1718c0cb374c1b8d309286f6a5935 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sat, 3 Aug 2013 16:20:21 +0200
Subject: [PATCH] MESSAGES: store 1 & 2 field to db - it has to be permanent.

---
 citadel/msgbase.c | 26 ++++++++++++++++++++------
 citadel/server.h  |  5 +++--
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index b00b8870b..cb94c8f89 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -3021,6 +3021,10 @@ void serialize_message(struct ser_ret *ret,		/* return values */
 	size_t wlen, fieldlen;
 	int i;
 	static char *forder = FORDER;
+	int n = sizeof(FORDER) - 1;
+	long lengths[sizeof(FORDER)];
+	
+	memset(lengths, 0, sizeof(lengths));
 
 	/*
 	 * Check for valid message format
@@ -3033,9 +3037,12 @@ void serialize_message(struct ser_ret *ret,		/* return values */
 	}
 
 	ret->len = 3;
-	for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL)
-				     ret->len = ret->len +
-					     strlen(msg->cm_fields[(int)forder[i]]) + 2;
+	for (i=0; i<n; ++i)
+		if (msg->cm_fields[(int)forder[i]] != NULL)
+		{
+			lengths[i] = strlen(msg->cm_fields[(int)forder[i]]);
+			ret->len += lengths[i] + 2;
+		}
 
 	ret->ser = malloc(ret->len);
 	if (ret->ser == NULL) {
@@ -3051,12 +3058,19 @@ void serialize_message(struct ser_ret *ret,		/* return values */
 	ret->ser[2] = msg->cm_format_type;
 	wlen = 3;
 
-	for (i=0; i<26; ++i) if (msg->cm_fields[(int)forder[i]] != NULL) {
-			fieldlen = strlen(msg->cm_fields[(int)forder[i]]);
+	for (i=0; i<n; ++i)
+		if (msg->cm_fields[(int)forder[i]] != NULL)
+		{
+			fieldlen = lengths[i];
 			ret->ser[wlen++] = (char)forder[i];
-			safestrncpy((char *)&ret->ser[wlen], msg->cm_fields[(int)forder[i]], fieldlen+1);
+
+			memcpy(&ret->ser[wlen],
+			       msg->cm_fields[(int)forder[i]],
+			       fieldlen+1);
+
 			wlen = wlen + fieldlen + 1;
 		}
+
 	if (ret->len != wlen) {
 		MSG_syslog(LOG_ERR, "ERROR: len=%ld wlen=%ld\n",
 			   (long)ret->len, (long)wlen);
diff --git a/citadel/server.h b/citadel/server.h
index bcca4fb2b..cd8034d19 100644
--- a/citadel/server.h
+++ b/citadel/server.h
@@ -297,7 +297,8 @@ struct UseTable {
 /* Preferred field order 							*/
 /*               **********			Important fields		*/
 /*                         ***************	Semi-important fields		*/
-/*                                        * 	Message text (MUST be last)	*/
-#define FORDER	"IPTAFONHRDBCEWJGKLQSVXZYUM"
+/*                                        **    internal only                   */
+/*                                          * 	Message text (MUST be last)	*/
+#define FORDER	"IPTAFONHRDBCEWJGKLQSVXZYU12M"
 
 #endif /* SERVER_H */
-- 
2.30.2