/*
- * 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.
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);
"<%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,
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. */
{
struct CtdlMessage *msg = NULL;
int ok_to_participate = 0;
- StrBuf *Buf = NULL;
recptypes *valid;
/*
* 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
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);
}
SpoolControl *sc;
sc = (SpoolControl *)userdata;
- msg = CtdlFetchMessage(msgnum, 1, 1);
+ msg = CtdlFetchMessage(msgnum, 1);
if (msg == NULL)
{