X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserv_network.c;h=668ed2964a30958c0af986b066cb4096820e79eb;hb=c60ee2e375c3b381e36ffebb525f21f7aaf608fd;hp=7efe6c62add4c55a2697e25ce110c0e557a99f49;hpb=4a7ad144766ca9c7845627fbf8b4956a0e8ed6e6;p=citadel.git diff --git a/citadel/serv_network.c b/citadel/serv_network.c index 7efe6c62a..668ed2964 100644 --- a/citadel/serv_network.c +++ b/citadel/serv_network.c @@ -470,7 +470,7 @@ void network_spool_msg(long msgnum, void *userdata) { msg->cm_fields['R'] = strdup(nptr->name); valid = validate_recipients(nptr->name); - CtdlSubmitMsg(msg, valid, ""); + CtdlSubmitMsg(msg, valid, NULL, NULL, ""); free(valid); } @@ -573,7 +573,7 @@ void network_spool_msg(long msgnum, void *userdata) { msg->cm_fields['R'] = strdup(nptr->name); valid = validate_recipients(nptr->name); - CtdlSubmitMsg(msg, valid, ""); + CtdlSubmitMsg(msg, valid, NULL, NULL, ""); free(valid); } @@ -748,7 +748,7 @@ void network_deliver_digest(struct SpoolControl *sc) { fclose(sc->digestfp); sc->digestfp = NULL; - msgnum = CtdlSubmitMsg(msg, NULL, SMTP_SPOOLOUT_ROOM); + msgnum = CtdlSubmitMsg(msg, NULL, NULL, NULL, SMTP_SPOOLOUT_ROOM); CtdlFreeMessage(msg); /* Now generate the delivery instructions */ @@ -794,7 +794,7 @@ void network_deliver_digest(struct SpoolControl *sc) { imsg->cm_fields['M'] = instr; /* Save delivery instructions in spoolout room */ - CtdlSubmitMsg(imsg, NULL, SMTP_SPOOLOUT_ROOM); + CtdlSubmitMsg(imsg, NULL, NULL, NULL, SMTP_SPOOLOUT_ROOM); CtdlFreeMessage(imsg); } @@ -1233,7 +1233,7 @@ void network_bounce(struct CtdlMessage *msg, char *reason) { if ( (valid == NULL) && (strlen(force_room) == 0) ) { strcpy(force_room, config.c_aideroom); } - CtdlSubmitMsg(msg, valid, force_room); + CtdlSubmitMsg(msg, valid, NULL, NULL, force_room); /* Clean up */ if (valid != NULL) free(valid); @@ -1413,7 +1413,7 @@ void network_process_buffer(char *buffer, long size) { /* save the message into a room */ if (PerformNetprocHooks(msg, target_room) == 0) { msg->cm_flags = CM_SKIP_HOOKS; - CtdlSubmitMsg(msg, recp, target_room); + CtdlSubmitMsg(msg, recp, NULL, NULL, target_room); } CtdlFreeMessage(msg); free(recp);