X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netmail.c;h=b4c5f713b8f9f6da65d7694b247e27b37564fa29;hp=6ee61cfd57317c3aec1d45864541af63d07d2289;hb=5ac2920028e92a453c686c799327d7a66b3e7b49;hpb=f59e2e6772d87d323d065f09919ec0876bf2e0be

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index 6ee61cfd5..b4c5f713b 100644
--- a/citadel/modules/network/serv_netmail.c
+++ b/citadel/modules/network/serv_netmail.c
@@ -1,7 +1,7 @@
 /*
  * 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.
@@ -269,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,
@@ -397,12 +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;
-		}
-	}
+
+	// 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