Removed some leftover dependencies on message fields which no longer exist

[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 bd761048a1faabc6ce908c4a8cef4845e29d7081..b4c5f713b8f9f6da65d7694b247e27b37564fa29 100644 (file)
--- a/citadel/modules/network/serv_netmail.c
+++ b/citadel/modules/network/serv_netmail.c
@@ -1,8 +1,7 @@
 /*
- * This module handles shared rooms, inter-Citadel mail, and outbound
- * mailing list processing.
+ * This module handles network mail and mailing list processing.
  *
- * Copyright (c) 2000-2018 by the citadel.org team
+ * Copyright (c) 2000-2020 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.
@@ -270,11 +269,6 @@ void network_process_digest(SpoolControl *sc, struct CtdlMessage *omsg, long *de
                                "<%s> ",
                                msg->cm_fields[erFc822Addr]);
                }
-               else if (!CM_IsEmpty(msg, eNodeName)) {
-                       fprintf(sc->digestfp,
-                               "@%s ",
-                               msg->cm_fields[eNodeName]);
-               }
                fprintf(sc->digestfp, "\n");
                if (!CM_IsEmpty(msg, eMsgSubject)) {
                        fprintf(sc->digestfp,
@@ -382,7 +376,6 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
 {
        struct CtdlMessage *msg = NULL;
        int ok_to_participate = 0;
-       StrBuf *Buf = NULL;
        recptypes *valid;
 
        /*
@@ -399,22 +392,11 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
         * is rude...
         */
        ok_to_participate = 0;
-       if (!CM_IsEmpty(msg, eNodeName)) {
-               if (!strcasecmp(msg->cm_fields[eNodeName], CtdlGetConfigStr("c_nodename")))
-               {
-                       ok_to_participate = 1;
-               }
-               
-               Buf = NewStrBufPlain(CM_KEY(msg, eNodeName));
-               if (CtdlIsValidNode(NULL,
-                                   NULL,
-                                   Buf,
-                                   sc->working_ignetcfg,
-                                   sc->the_netmap) == 0)
-               {
-                       ok_to_participate = 1;
-               }
-       }
+
+       // FIXME -- After we removed CitaNet/IGnet support , we now need a new heuristic to determine
+       // whether a message originated locally.  This means the "participate" mode no longer works.
+       // We'll definitely need to refactor this when we do other federated stuff later.
+
        if (ok_to_participate)
        {
                /* Replace the Internet email address of the
@@ -430,7 +412,6 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
                CtdlSubmitMsg(msg, valid, "", 0);
                free_recipients(valid);
        }
-       FreeStrBuf(&Buf);
        CM_Free(msg);
 }