X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netmail.c;h=ce94c1fc4a3741b054fc487f061fb22a6afac96b;hb=0ca1d79e24b57ed59ab3c2e81f04c9463c3a1c5b;hp=e2b2f2183af4b4f579bcbff9f9ed0046f32b5583;hpb=2dff3764daf64c3ad1cabd92da2385331e05db3a;p=citadel.git

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index e2b2f2183..ce94c1fc4 100644
--- a/citadel/modules/network/serv_netmail.c
+++ b/citadel/modules/network/serv_netmail.c
@@ -256,7 +256,11 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc) {
 /*
  * Spools out one message from the list.
  */
-void network_spool_msg(long msgnum, void *userdata) {
+void network_spool_msg(long msgnum, 
+		       void *userdata, 
+		       char *working_ignetcfg,
+		       NetMap *the_netmap)
+{
 	SpoolControl *sc;
 	int i;
 	char *newpath = NULL;
@@ -428,7 +432,12 @@ void network_spool_msg(long msgnum, void *userdata) {
 				if (!strcasecmp(msg->cm_fields['N'], config.c_nodename)) {
 					ok_to_participate = 1;
 				}
-				if (is_valid_node(NULL, NULL, msg->cm_fields['N']) == 0) {
+				if (is_valid_node(NULL, 
+						  NULL, 
+						  msg->cm_fields['N'], 
+						  working_ignetcfg, 
+						  the_netmap) == 0)
+				{
 					ok_to_participate = 1;
 				}
 			}
@@ -510,7 +519,12 @@ void network_spool_msg(long msgnum, void *userdata) {
 			send = 1;
 
 			/* Check for valid node name */
-			if (is_valid_node(NULL, NULL, mptr->remote_nodename) != 0) {
+			if (is_valid_node(NULL, 
+					  NULL, 
+					  mptr->remote_nodename, 
+					  working_ignetcfg, 
+					  the_netmap) != 0)
+			{
 				syslog(LOG_ERR, "Invalid node <%s>\n", mptr->remote_nodename);
 				send = 0;
 			}