Adjustments to journal recipient list

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 52da802a29a38507f10f4b34a91021022c76dbd6..365a044d1ac6148d2721fb1a361fa48a41a6a6a7 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,5 +1,8 @@
 $Id$
 
+Thu Jan  5 17:38:39 EST 2006 ajc
+* Adjustments to journal recipient list 
+
 Thu Jan  5 16:08:47 EST 2006 ajc
 * Implemented configuration settings for journaling.
 

diff --git a/citadel/journaling.c b/citadel/journaling.c
index b1af2b9c6d63101052c03d3f95170e4395726c26..26af56e11c6eee8df327221c381b925f8987344f 100644 (file)
--- a/citadel/journaling.c
+++ b/citadel/journaling.c
@@ -159,27 +159,27 @@ void JournalRunQueueMsg(struct jnlq *jmsg) {
                                jmsg->msgn
                        );
 
-                       if (journal_recps->num_local > 0) {
-                               for (i=0; i<journal_recps->num_local; ++i) {
-                                       extract_token(recipient, journal_recps->recp_local,
+                       if (jmsg->recps.num_local > 0) {
+                               for (i=0; i<jmsg->recps.num_local; ++i) {
+                                       extract_token(recipient, jmsg->recps.recp_local,
                                                        i, '|', sizeof recipient);
                                        sprintf(&message_text[strlen(message_text)],
                                                "       %s\r\n", recipient);
                                }
                        }
 
-                       if (journal_recps->num_ignet > 0) {
-                               for (i=0; i<journal_recps->num_ignet; ++i) {
-                                       extract_token(recipient, journal_recps->recp_ignet,
+                       if (jmsg->recps.num_ignet > 0) {
+                               for (i=0; i<jmsg->recps.num_ignet; ++i) {
+                                       extract_token(recipient, jmsg->recps.recp_ignet,
                                                        i, '|', sizeof recipient);
                                        sprintf(&message_text[strlen(message_text)],
                                                "       %s\r\n", recipient);
                                }
                        }
 
-                       if (journal_recps->num_internet > 0) {
-                               for (i=0; i<journal_recps->num_internet; ++i) {
-                                       extract_token(recipient, journal_recps->recp_internet,
+                       if (jmsg->recps.num_internet > 0) {
+                               for (i=0; i<jmsg->recps.num_internet; ++i) {
+                                       extract_token(recipient, jmsg->recps.recp_internet,
                                                        i, '|', sizeof recipient);
                                        sprintf(&message_text[strlen(message_text)],
                                                "       %s\r\n", recipient);