MAILINGLIST: ListID doesn't seem to work well - revert to use the ReplyTo header.

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

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index d44be90745cb17882c9727825379b75c67931440..fd1de7abe71aac452a024a0fa21567395c38be56 100644 (file)
--- a/citadel/modules/network/serv_netmail.c
+++ b/citadel/modules/network/serv_netmail.c
@@ -72,7 +72,6 @@
 #include "internet_addressing.h"
 #include "serv_network.h"
 #include "clientsocket.h"
-#include "file_ops.h"
 #include "citadel_dirs.h"
 #include "threads.h"
 #include "context.h"
@@ -137,8 +136,7 @@ static void ListCalculateSubject(struct CtdlMessage *msg)
                Subject = NewStrBufPlain(HKEY("(no subject)"));
        }
        else {
-               Subject = NewStrBufPlain(
-                       msg->cm_fields[eMsgSubject], -1);
+               Subject = NewStrBufPlain(CM_KEY(msg, eMsgSubject));
        }
        FlatSubject = NewStrBufPlain(NULL, StrLength(Subject));
        StrBuf_RFC822_to_Utf8(FlatSubject, Subject, NULL, NULL);
@@ -181,7 +179,7 @@ void network_deliver_digest(SpoolControl *sc)
        char *pbuf;
        struct CtdlMessage *msg = NULL;
        long msglen;
-       struct recptypes *valid;
+       recptypes *valid;
        char bounce_to[256];
 
        if (sc->Users[listrecp] == NULL)
@@ -327,7 +325,7 @@ void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *dele
        msg = CM_Duplicate(omsg);
 
 
-       CM_SetField(msg, eListID, SKEY(sc->Users[roommailalias]));
+       CM_SetField(msg, eReplyTo, SKEY(sc->Users[roommailalias]));
 
        /* if there is no other recipient, Set the recipient
         * of the list message to the email address of the
@@ -355,7 +353,7 @@ void network_process_list(SpoolControl *sc, struct CtdlMessage *omsg, long *dele
  */
 void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char *RoomName)
 {
-       struct recptypes *valid;
+       recptypes *valid;
        char bounce_to[256];
 
        /* Don't do this if there were no recipients! */
@@ -386,7 +384,7 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
        struct CtdlMessage *msg = NULL;
        int ok_to_participate = 0;
        StrBuf *Buf = NULL;
-       struct recptypes *valid;
+       recptypes *valid;
 
        /*
         * Process client-side list participations for this room
@@ -408,7 +406,7 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
                        ok_to_participate = 1;
                }
                
-               Buf = NewStrBufPlain(msg->cm_fields[eNodeName], -1);
+               Buf = NewStrBufPlain(CM_KEY(msg, eNodeName));
                if (CtdlIsValidNode(NULL,
                                    NULL,
                                    Buf,