move the citadel protocol message handlers ino modules/citadel

[citadel.git] / citadel / modules / smtp / serv_smtp.c

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index 4eec7e85d5852400de7e4cb750b189082c7eef48..681e0c740bf1076a89e25c61563d87393b51110b 100644 (file)
--- 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));
                }