X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fnetwork%2Fserv_netmail.c;h=a1938c64cbcfbe949d31c5c4df14d7bd081a47df;hb=2b57abb4e89077f1bdf104e95203015810cf1a6f;hp=fd1de7abe71aac452a024a0fa21567395c38be56;hpb=c382f04eece05b2b94ce07b5066c524f4359ced2;p=citadel.git

diff --git a/citadel/modules/network/serv_netmail.c b/citadel/modules/network/serv_netmail.c
index fd1de7abe..a1938c64c 100644
--- a/citadel/modules/network/serv_netmail.c
+++ b/citadel/modules/network/serv_netmail.c
@@ -182,14 +182,8 @@ void network_deliver_digest(SpoolControl *sc)
 	recptypes *valid;
 	char bounce_to[256];
 
-	if (sc->Users[listrecp] == NULL)
-		return;
-
-	if (sc->num_msgs_spooled < 1) {
-		fclose(sc->digestfp);
-		sc->digestfp = NULL;
+	if (sc->Users[digestrecp] == NULL)
 		return;
-	}
 
 	msg = malloc(sizeof(struct CtdlMessage));
 	memset(msg, 0, sizeof(struct CtdlMessage));
@@ -219,19 +213,15 @@ void network_deliver_digest(SpoolControl *sc)
 	fread(pbuf, (size_t)msglen, 1, sc->digestfp);
 	pbuf[msglen] = '\0';
 	CM_SetAsField(msg, eMesageText, &pbuf, msglen);
-	fclose(sc->digestfp);
-	sc->digestfp = NULL;
 
 	/* Now generate the delivery instructions */
-	if (sc->Users[listrecp] == NULL)
-		return;
 
 	/* 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 */
-	valid = validate_recipients(ChrPtr(sc->Users[listrecp]), NULL, 0);
+	valid = validate_recipients(ChrPtr(sc->Users[digestrecp]), NULL, 0);
 	if (valid != NULL) {
 		valid->bounce_to = strdup(bounce_to);
 		valid->envelope_from = strdup(bounce_to);
@@ -256,6 +246,7 @@ void network_process_digest(SpoolControl *sc, struct CtdlMessage *omsg, long *de
 
 	msg = CM_Duplicate(omsg);
 	if (msg != NULL) {
+		sc->haveDigest = 1;
 		fprintf(sc->digestfp,
 			" -----------------------------------"
 			"------------------------------------"