CM_SetField() no longer accepts a length, just uses strdup()

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

diff --git a/citadel/server/modules/smtp/serv_smtp.c b/citadel/server/modules/smtp/serv_smtp.c
index 0c09e005f1b75066e3d7397b7fcadf4bd41587d1..f5bcab98c70abad7b1d78bda330717775340e4da 100644 (file)
--- a/citadel/server/modules/smtp/serv_smtp.c
+++ b/citadel/server/modules/smtp/serv_smtp.c
@@ -19,7 +19,7 @@
 // The VRFY and EXPN commands have been removed from this implementation
 // because nobody uses these commands anymore, except for spammers.
 //
-// Copyright (c) 1998-2022 by the citadel.org team
+// Copyright (c) 1998-2023 by the citadel.org team
 //
 // This program is open source software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 3.
@@ -757,27 +757,27 @@ void smtp_data(void) {
                        return;
                }
 
-               CM_SetField(msg, eOriginalRoom, HKEY(MAILROOM));
+               CM_SetField(msg, eOriginalRoom, MAILROOM);
                if (SMTP->preferred_sender_name != NULL)
-                       CM_SetField(msg, eAuthor, SKEY(SMTP->preferred_sender_name));
+                       CM_SetField(msg, eAuthor, ChrPtr(SMTP->preferred_sender_name));
                else 
-                       CM_SetField(msg, eAuthor, CC->user.fullname, strlen(CC->user.fullname));
+                       CM_SetField(msg, eAuthor, CC->user.fullname);
 
                if (!validemail) {
                        if (SMTP->preferred_sender_email != NULL) {
-                               CM_SetField(msg, erFc822Addr, SKEY(SMTP->preferred_sender_email));
+                               CM_SetField(msg, erFc822Addr, ChrPtr(SMTP->preferred_sender_email));
                        }
                        else {
-                               CM_SetField(msg, erFc822Addr, CC->cs_inet_email, strlen(CC->cs_inet_email));
+                               CM_SetField(msg, erFc822Addr, CC->cs_inet_email);
                        }
                }
        }
 
        // Set the "envelope from" address
-       CM_SetField(msg, eMessagePath, SKEY(SMTP->from));
+       CM_SetField(msg, eMessagePath, ChrPtr(SMTP->from));
 
        // Set the "envelope to" address
-       CM_SetField(msg, eenVelopeTo, SKEY(SMTP->recipients));
+       CM_SetField(msg, eenVelopeTo, ChrPtr(SMTP->recipients));
 
        // Submit the message into the Citadel system.
        valid = validate_recipients(
@@ -799,7 +799,7 @@ void smtp_data(void) {
        if (scan_errors > 0) {  // We don't want this message!
 
                if (CM_IsEmpty(msg, eErrorMsg)) {
-                       CM_SetField(msg, eErrorMsg, HKEY("Message rejected by filter"));
+                       CM_SetField(msg, eErrorMsg, "Message rejected by filter");
                }
 
                StrBufPrintf(SMTP->OneRcpt, "550 %s\r\n", msg->cm_fields[eErrorMsg]);