X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netmail.c;fp=citadel%2Fmodules%2Fnetwork%2Fserv_netmail.c;h=9ca6ba5a957af81458a21d1323a9a639e9f851af;hp=c4038869f7613a414fad4ab8de92bbfd62cf41bc;hb=7c94d5bb68f1c448770d31205ec5ae12bd8a02ed;hpb=c8c89455faeb5a76d6ee2264f497b8f790e0e392

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index c4038869f..9ca6ba5a9 100644
--- a/citadel/modules/network/serv_netmail.c
+++ b/citadel/modules/network/serv_netmail.c
@@ -2,7 +2,7 @@
  * This module handles shared rooms, inter-Citadel mail, and outbound
  * mailing list processing.
  *
- * Copyright (c) 2000-2012 by the citadel.org team
+ * Copyright (c) 2000-2015 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.
@@ -218,7 +218,7 @@ void network_deliver_digest(SpoolControl *sc)
 
 	/* Where do we want bounces and other noise to be heard?
 	 * Surely not the list members! */
-	snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
+	snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", CtdlGetConfigStr("c_fqdn"));
 
 	/* Now submit the message */
 	valid = validate_recipients(ChrPtr(sc->Users[digestrecp]), NULL, 0);
@@ -366,7 +366,7 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char
 
 	/* Where do we want bounces and other noise to be heard?
 	 *  Surely not the list members! */
-	snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
+	snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", CtdlGetConfigStr("c_fqdn"));
 
 	/* Now submit the message */
 	valid = validate_recipients(ChrPtr(sc->Users[listrecp]), NULL, 0);
@@ -403,8 +403,8 @@ void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
 	 */
 	ok_to_participate = 0;
 	if (!CM_IsEmpty(msg, eNodeName)) {
-		if (!strcasecmp(msg->cm_fields[eNodeName],
-				config.c_nodename)) {
+		if (!strcasecmp(msg->cm_fields[eNodeName], CtdlGetConfigStr("c_nodename")))
+		{
 			ok_to_participate = 1;
 		}
 		
@@ -595,7 +595,7 @@ void network_spool_msg(long msgnum,
 
 	sc = (SpoolControl *)userdata;
 
-	msg = CtdlFetchMessage(msgnum, 1);
+	msg = CtdlFetchMessage(msgnum, 1, 1);
 
 	if (msg == NULL)
 	{