X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netmail.c;h=e46a1dfde1c061f70753489f9709574f1b690ed9;hp=ce94c1fc4a3741b054fc487f061fb22a6afac96b;hb=1034d33f851d45ec99dc8a45eb2dede1d63bacb0;hpb=45c969d788618c1eb6a126b7d3d4f43c8d04879b diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c index ce94c1fc4..e46a1dfde 100644 --- a/citadel/modules/network/serv_netmail.c +++ b/citadel/modules/network/serv_netmail.c @@ -89,6 +89,7 @@ #include "context.h" #include "netconfig.h" #include "netspool.h" +#include "netmail.h" #include "ctdl_module.h" @@ -257,9 +258,7 @@ void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc) { * Spools out one message from the list. */ void network_spool_msg(long msgnum, - void *userdata, - char *working_ignetcfg, - NetMap *the_netmap) + void *userdata) { SpoolControl *sc; int i; @@ -435,8 +434,8 @@ void network_spool_msg(long msgnum, if (is_valid_node(NULL, NULL, msg->cm_fields['N'], - working_ignetcfg, - the_netmap) == 0) + sc->working_ignetcfg, + sc->the_netmap) == 0) { ok_to_participate = 1; } @@ -522,8 +521,8 @@ void network_spool_msg(long msgnum, if (is_valid_node(NULL, NULL, mptr->remote_nodename, - working_ignetcfg, - the_netmap) != 0) + sc->working_ignetcfg, + sc->the_netmap) != 0) { syslog(LOG_ERR, "Invalid node <%s>\n", mptr->remote_nodename); send = 0;