From de7c96869e290f7456bd807cebf2da0d7d3ace84 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sat, 14 Sep 2013 10:54:06 +0200
Subject: [PATCH] move the citadel protocol message handlers ino
 modules/citadel

---
 citadel/Makefile.in                                         | 4 ++--
 citadel/{ctdl_message.c => modules/citadel/serv_messages.c} | 0
 citadel/modules/smtp/serv_smtp.c                            | 6 +++---
 citadel/scripts/mk_module_init.sh                           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename citadel/{ctdl_message.c => modules/citadel/serv_messages.c} (100%)

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 8f8e4724a..8a982d920 100644
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -78,7 +78,7 @@ SOURCES=utils/aidepost.c utils/citmail.c \
 	citserver.c clientsocket.c config.c control.c $(DATABASE) \
 	domain.c serv_extensions.c file_ops.c genstamp.c \
 	housekeeping.c ical_dezonify.c internet_addressing.c ecrash.c \
-	locate_host.c auth.c msgbase.c ctdl_message.c parsedate.c \
+	locate_host.c auth.c msgbase.c parsedate.c \
 	room_ops.c euidindex.c server_main.c ldap.c \
 	support.c sysdep.c user_ops.c journaling.c threads.c \
 	context.c event_client.c netconfig.c nttlist.c md5.c
@@ -131,7 +131,7 @@ SERV_OBJS = server_main.o utillib/citadel_dirs.o event_client.o \
 	user_ops.o citserver.o sysdep.o serv_extensions.o \
 	$(DATABASE:.c=.o) domain.o \
 	control.o config.o support.o room_ops.o \
-	file_ops.o msgbase.o ctdl_message.o euidindex.o \
+	file_ops.o msgbase.o euidindex.o \
 	locate_host.o housekeeping.o ical_dezonify.o \
 	internet_addressing.o journaling.o \
 	parsedate.o genstamp.o ecrash.o threads.o context.o \
diff --git a/citadel/ctdl_message.c b/citadel/modules/citadel/serv_messages.c
similarity index 100%
rename from citadel/ctdl_message.c
rename to citadel/modules/citadel/serv_messages.c
diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index 4eec7e85d..681e0c740 100644
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -863,13 +863,13 @@ void smtp_data(long offset, long flags)
 		CM_SetField(msg, eHumanNode, config.c_humannode, strlen(config.c_humannode));
         	CM_SetField(msg, eOriginalRoom, HKEY(MAILROOM));
 		if (sSMTP->preferred_sender_name != NULL)
-			CM_SetFieldSB(msg, eAuthor, sSMTP->preferred_sender_name);
+			CM_SetField(msg, eAuthor, SKEY(sSMTP->preferred_sender_name));
 		else 
 			CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
 
 		if (!validemail) {
-			if((sSMTP->preferred_sender_email != NULL)
-				CM_SetFieldSB(msg, erFc822Addr, sSMTP->preferred_sender_email)) 
+			if (sSMTP->preferred_sender_email != NULL)
+				CM_SetField(msg, erFc822Addr, SKEY(sSMTP->preferred_sender_email));
 			else
 				CM_SetField(msg, erFc822Addr, CCC->cs_inet_email, strlen(CCC->cs_inet_email));
 		}
diff --git a/citadel/scripts/mk_module_init.sh b/citadel/scripts/mk_module_init.sh
index 5f4505511..ee11a42b6 100755
--- a/citadel/scripts/mk_module_init.sh
+++ b/citadel/scripts/mk_module_init.sh
@@ -30,7 +30,7 @@ U_FILE="$CUR_DIR/modules_upgrade.c"
 
 /usr/bin/printf "Scanning extension modules for entry points.\n"
 
-STATIC_FIRST_MODULES="citserver control modules euidindex file_ops msgbase ctdl_message room_ops user_ops nttlist database internet_addressing"
+STATIC_FIRST_MODULES="citserver control modules euidindex file_ops msgbase room_ops user_ops nttlist database internet_addressing"
 DYNAMIC_MODULES=`grep CTDL_MODULE_INIT modules/*/*.c |$SED 's;.*(\(.*\));\1;'`
 if test -d user_modules; then 
     USER_MODULES=`grep CTDL_MODULE_INIT user_modules/*/*.c |$SED 's;.*(\(.*\));\1;'`
-- 
2.30.2