Adjust preconditions for attempting a digest delivery.

[citadel.git] / citadel / modules / network / serv_network.c

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 32bf49564a1f4f7b6f370df7eacf5abe4e3cdf15..9fa82734e8a278d52ba71bf5669164250177b36c 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -116,11 +116,11 @@ int network_usetable(struct CtdlMessage *msg)
        }
 
        /* Generate the message ID */
-       msgid = NewStrBufPlain(msg->cm_fields[emessageId], -1);
+       msgid = NewStrBufPlain(CM_KEY(msg, emessageId));
        if (haschar(ChrPtr(msgid), '@') == 0) {
                StrBufAppendBufPlain(msgid, HKEY("@"), 0);
                if (!CM_IsEmpty(msg, eNodeName)) {
-                       StrBufAppendBufPlain(msgid, msg->cm_fields[eNodeName], -1, 0);
+                       StrBufAppendBufPlain(msgid, CM_KEY(msg, eNodeName), 0);
                }
                else {
                        FreeStrBuf(&msgid);
@@ -391,7 +391,7 @@ void network_bounce(struct CtdlMessage *msg, char *reason)
                       msg->cm_fields[eNodeName]);
 
        CM_SetField(msg, eAuthor, HKEY(BOUNCESOURCE));
-       CM_SetField(msg, eNodeName, config.c_nodename, strlen(config.c_nodename));
+       CM_SetField(msg, eNodeName, CFG_KEY(c_nodename));
        CM_SetField(msg, eMsgSubject, HKEY("Delivery Status Notification (Failure)"));
 
        Netmap_AddMe(msg, HKEY("unknown_user"));