projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust preconditions for attempting a digest delivery.
[citadel.git]
/
citadel
/
modules
/
network
/
serv_netmail.c
diff --git
a/citadel/modules/network/serv_netmail.c
b/citadel/modules/network/serv_netmail.c
index 2782fbf8f23bf60a4b8a08fe98534b5fe362cac7..a1938c64cbcfbe949d31c5c4df14d7bd081a47df 100644
(file)
--- a/
citadel/modules/network/serv_netmail.c
+++ b/
citadel/modules/network/serv_netmail.c
@@
-185,12
+185,6
@@
void network_deliver_digest(SpoolControl *sc)
if (sc->Users[digestrecp] == NULL)
return;
if (sc->Users[digestrecp] == NULL)
return;
- if (sc->num_msgs_spooled < 1) {
- fclose(sc->digestfp);
- sc->digestfp = NULL;
- return;
- }
-
msg = malloc(sizeof(struct CtdlMessage));
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_magic = CTDLMESSAGE_MAGIC;
msg = malloc(sizeof(struct CtdlMessage));
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_magic = CTDLMESSAGE_MAGIC;
@@
-221,11
+215,9
@@
void network_deliver_digest(SpoolControl *sc)
CM_SetAsField(msg, eMesageText, &pbuf, msglen);
/* Now generate the delivery instructions */
CM_SetAsField(msg, eMesageText, &pbuf, msglen);
/* Now generate the delivery instructions */
- if (sc->Users[digestrecp] == NULL)
- return;
/* Where do we want bounces and other noise to be heard?
/* Where do we want bounces and other noise to be heard?
- *Surely not the list members! */
+ *
Surely not the list members! */
snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
/* Now submit the message */
snprintf(bounce_to, sizeof bounce_to, "room_aide@%s", config.c_fqdn);
/* Now submit the message */
@@
-254,6
+246,7
@@
void network_process_digest(SpoolControl *sc, struct CtdlMessage *omsg, long *de
msg = CM_Duplicate(omsg);
if (msg != NULL) {
msg = CM_Duplicate(omsg);
if (msg != NULL) {
+ sc->haveDigest = 1;
fprintf(sc->digestfp,
" -----------------------------------"
"------------------------------------"
fprintf(sc->digestfp,
" -----------------------------------"
"------------------------------------"