X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netmail.c;h=820c2fe9f6f8448b9b469ff55b2a914a57355b18;hb=0387f48886a9395d89eaca01cd40ab751610426f;hp=bd761048a1faabc6ce908c4a8cef4845e29d7081;hpb=95bec9b0981b84742273c45d39aca9cb7cc9f5ef;p=citadel.git

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index bd761048a..820c2fe9f 100644
--- 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.
@@ -222,7 +221,7 @@ void network_deliver_digest(SpoolControl *sc)
 	if (valid != NULL) {
 		valid->bounce_to = strdup(bounce_to);
 		valid->envelope_from = strdup(bounce_to);
-		CtdlSubmitMsg(msg, valid, NULL, 0);
+		CtdlSubmitMsg(msg, valid, NULL);
 	}
 	CM_Free(msg);
 	free_recipients(valid);
@@ -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,
@@ -371,7 +365,7 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char
 		valid->bounce_to = strdup(bounce_to);
 		valid->envelope_from = strdup(bounce_to);
 		valid->sending_room = strdup(RoomName);
-		CtdlSubmitMsg(msg, valid, NULL, 0);
+		CtdlSubmitMsg(msg, valid, NULL);
 		free_recipients(valid);
 	}
 	/* Do not call CM_Free(msg) here; the caller will free it. */
@@ -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
@@ -427,10 +409,9 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
 		valid = validate_recipients(ChrPtr(sc->Users[participate]) , NULL, 0);
 
 		CM_SetField(msg, eRecipient, SKEY(sc->Users[roommailalias]));
-		CtdlSubmitMsg(msg, valid, "", 0);
+		CtdlSubmitMsg(msg, valid, "");
 		free_recipients(valid);
 	}
-	FreeStrBuf(&Buf);
 	CM_Free(msg);
 }
 
@@ -445,7 +426,7 @@ void network_spool_msg(long msgnum, void *userdata)
 	SpoolControl *sc;
 
 	sc = (SpoolControl *)userdata;
-	msg = CtdlFetchMessage(msgnum, 1, 1);
+	msg = CtdlFetchMessage(msgnum, 1);
 
 	if (msg == NULL)
 	{