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 c4038869f7613a414fad4ab8de92bbfd62cf41bc..9ca6ba5a957af81458a21d1323a9a639e9f851af 100644
(file)
--- a/
citadel/modules/network/serv_netmail.c
+++ b/
citadel/modules/network/serv_netmail.c
@@
-2,7
+2,7
@@
* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
* This module handles shared rooms, inter-Citadel mail, and outbound
* mailing list processing.
*
- * Copyright (c) 2000-201
2
by the citadel.org team
+ * Copyright (c) 2000-201
5
by the citadel.org team
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 3.
*
* This program is open source software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License, version 3.
@@
-218,7
+218,7
@@
void network_deliver_digest(SpoolControl *sc)
/* Where do we want bounces and other noise to be heard?
* Surely not the list members! */
/* Where do we want bounces and other noise to be heard?
* Surely not the list members! */
- snprintf(bounce_to, sizeof bounce_to, "room_aide@%s",
config.c_fqdn
);
+ snprintf(bounce_to, sizeof bounce_to, "room_aide@%s",
CtdlGetConfigStr("c_fqdn")
);
/* Now submit the message */
valid = validate_recipients(ChrPtr(sc->Users[digestrecp]), NULL, 0);
/* Now submit the message */
valid = validate_recipients(ChrPtr(sc->Users[digestrecp]), NULL, 0);
@@
-366,7
+366,7
@@
void network_deliver_list(struct CtdlMessage *msg, SpoolControl *sc, const char
/* Where do we want bounces and other noise to be heard?
* Surely not the list members! */
/* Where do we want bounces and other noise to be heard?
* Surely not the list members! */
- snprintf(bounce_to, sizeof bounce_to, "room_aide@%s",
config.c_fqdn
);
+ snprintf(bounce_to, sizeof bounce_to, "room_aide@%s",
CtdlGetConfigStr("c_fqdn")
);
/* Now submit the message */
valid = validate_recipients(ChrPtr(sc->Users[listrecp]), NULL, 0);
/* Now submit the message */
valid = validate_recipients(ChrPtr(sc->Users[listrecp]), NULL, 0);
@@
-403,8
+403,8
@@
void network_process_participate(SpoolControl *sc, struct CtdlMessage *omsg, lon
*/
ok_to_participate = 0;
if (!CM_IsEmpty(msg, eNodeName)) {
*/
ok_to_participate = 0;
if (!CM_IsEmpty(msg, eNodeName)) {
- if (!strcasecmp(msg->cm_fields[eNodeName],
-
config.c_nodename))
{
+ if (!strcasecmp(msg->cm_fields[eNodeName],
CtdlGetConfigStr("c_nodename")))
+ {
ok_to_participate = 1;
}
ok_to_participate = 1;
}
@@
-595,7
+595,7
@@
void network_spool_msg(long msgnum,
sc = (SpoolControl *)userdata;
sc = (SpoolControl *)userdata;
- msg = CtdlFetchMessage(msgnum, 1);
+ msg = CtdlFetchMessage(msgnum, 1
, 1
);
if (msg == NULL)
{
if (msg == NULL)
{