projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
[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 fd1de7abe71aac452a024a0fa21567395c38be56..2782fbf8f23bf60a4b8a08fe98534b5fe362cac7 100644
(file)
--- a/
citadel/modules/network/serv_netmail.c
+++ b/
citadel/modules/network/serv_netmail.c
@@
-182,7
+182,7
@@
void network_deliver_digest(SpoolControl *sc)
recptypes *valid;
char bounce_to[256];
recptypes *valid;
char bounce_to[256];
- if (sc->Users[
li
strecp] == NULL)
+ if (sc->Users[
dige
strecp] == NULL)
return;
if (sc->num_msgs_spooled < 1) {
return;
if (sc->num_msgs_spooled < 1) {
@@
-219,11
+219,9
@@
void network_deliver_digest(SpoolControl *sc)
fread(pbuf, (size_t)msglen, 1, sc->digestfp);
pbuf[msglen] = '\0';
CM_SetAsField(msg, eMesageText, &pbuf, msglen);
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 */
/* Now generate the delivery instructions */
- if (sc->Users[
li
strecp] == NULL)
+ if (sc->Users[
dige
strecp] == NULL)
return;
/* Where do we want bounces and other noise to be heard?
return;
/* Where do we want bounces and other noise to be heard?
@@
-231,7
+229,7
@@
void network_deliver_digest(SpoolControl *sc)
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 */
- valid = validate_recipients(ChrPtr(sc->Users[
li
strecp]), NULL, 0);
+ valid = validate_recipients(ChrPtr(sc->Users[
dige
strecp]), NULL, 0);
if (valid != NULL) {
valid->bounce_to = strdup(bounce_to);
valid->envelope_from = strdup(bounce_to);
if (valid != NULL) {
valid->bounce_to = strdup(bounce_to);
valid->envelope_from = strdup(bounce_to);