X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netspool.c;h=9698c3694f1f3aceb4f3100459a539505601f4f5;hp=86cffbdef50e0613d3d8319c337fedb7858ce8a0;hb=1a2ef2893789470310f1a844dbfac0850680131d;hpb=29dc94694924296f8a969b48ece4e8a82677f9c7

diff --git a/citadel/modules/network/serv_netspool.c b/citadel/modules/network/serv_netspool.c
index 86cffbdef..9698c3694 100644
--- a/citadel/modules/network/serv_netspool.c
+++ b/citadel/modules/network/serv_netspool.c
@@ -2,15 +2,15 @@
  * 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.
+ * 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.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
  * ** NOTE **   A word on the S_NETCONFIGS semaphore:
  * This is a fairly high-level type of critical section.  It ensures that no
@@ -168,10 +168,10 @@ void Netmap_AddMe(struct CtdlMessage *msg, const char *defl, long defllen)
 	if (CM_IsEmpty(msg, eMessagePath)) {
 		CM_SetField(msg, eMessagePath, defl, defllen);
 	}
-	node_len = strlen(config.c_nodename);
+	node_len = strlen(CtdlGetConfigStr("c_nodename"));
 	if (node_len >= SIZ) 
 		node_len = SIZ - 1;
-	memcpy(buf, config.c_nodename, node_len);
+	memcpy(buf, CtdlGetConfigStr("c_nodename"), node_len);
 	buf[node_len] = '!';
 	buf[node_len + 1] = '\0';
 	CM_PrependToField(msg, eMessagePath, buf, node_len + 1);
@@ -307,7 +307,7 @@ void CalcListID(SpoolControl *sc)
 		StrBufAppendBufPlain(sc->ListID, HKEY("room_"), 0);
 		StrBufAppendBuf(sc->ListID, RoomName, 0);
 		StrBufAppendBufPlain(sc->ListID, HKEY("."), 0);
-		StrBufAppendBufPlain(sc->ListID, config.c_fqdn, -1, 0);
+		StrBufAppendBufPlain(sc->ListID, CtdlGetConfigStr("c_fqdn"), -1, 0);
 		/*
 		 * this used to be:
 		 * roomname <Room-Number.list-id.fqdn>
@@ -325,7 +325,7 @@ void CalcListID(SpoolControl *sc)
 		StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("room_"), 0);
 		StrBufAppendBuf(sc->Users[roommailalias], RoomName, 0);
 		StrBufAppendBufPlain(sc->Users[roommailalias], HKEY("@"), 0);
-		StrBufAppendBufPlain(sc->Users[roommailalias], config.c_fqdn, -1, 0);
+		StrBufAppendBufPlain(sc->Users[roommailalias], CtdlGetConfigStr("c_fqdn"), -1, 0);
 
 		StrBufLowerCase(sc->Users[roommailalias]);
 	}
@@ -374,8 +374,7 @@ void network_spoolout_room(SpoolControl *sc)
 	}
 	else
 	{
-		snprintf(buf, sizeof buf, "room_%s@%s",
-			 CCC->room.QRname, config.c_fqdn);
+		snprintf(buf, sizeof buf, "room_%s@%s", CCC->room.QRname, CtdlGetConfigStr("c_fqdn"));
 	}
 
 	for (i=0; buf[i]; ++i) {
@@ -485,7 +484,7 @@ void network_process_buffer(char *buffer, long size, HashList *working_ignetcfg,
 
 	/* Check for message routing */
 	if (!CM_IsEmpty(msg, eDestination)) {
-		if (strcasecmp(msg->cm_fields[eDestination], config.c_nodename)) {
+		if (strcasecmp(msg->cm_fields[eDestination], CtdlGetConfigStr("c_nodename"))) {
 
 			/* route the message */
 			Buf = NewStrBufPlain(CM_KEY(msg,eDestination));