Citadel Networking: add configured remote room name, so its later on put into the...

[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 a04bcfb12719aed29726c6a83410af3724d4c2b6..b84c5dea2c941224fb7e31557495047521a54b6f 100644 (file)
--- a/citadel/modules/network/serv_netmail.c
+++ b/citadel/modules/network/serv_netmail.c
@@ -117,6 +117,12 @@ void aggregate_recipients(StrBuf **recps, RoomNetCfg Which, OneRoomNetCfg *OneRN
                                StrBufAppendBufPlain(*recps, HKEY(","), i);
                }
                StrBufAppendBuf(*recps, nptr->Value[0], 0);
+               if (Which == ignet_push_share)
+               {
+                       StrBufAppendBufPlain(*recps, HKEY(","), 0);
+                       StrBufAppendBuf(*recps, nptr->Value[1], 0);
+
+               }
        }
 }
 
@@ -526,7 +532,7 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long
                        }
                        
                        QN_syslog(LOG_INFO,
-                                 "%sSending to %s\n",
+                                 " %sSending to %s\n",
                                  (send)?"":"Not ",
                                  ChrPtr(Recipient));
                }
@@ -600,6 +606,7 @@ void network_process_ignetpush(SpoolControl *sc, struct CtdlMessage *omsg, long
 void network_spool_msg(long msgnum,
                       void *userdata)
 {
+       struct CitContext *CCC = CC;
        struct CtdlMessage *msg = NULL;
        long delete_after_send = 0;     /* Set to 1 to delete after spooling */
        SpoolControl *sc;
@@ -608,6 +615,13 @@ void network_spool_msg(long msgnum,
 
        msg = CtdlFetchMessage(msgnum, 1);
 
+       if (msg == NULL)
+       {
+               QN_syslog(LOG_ERR,
+                         "failed to load Message <%ld> from disk\n",
+                         msgnum);
+               return;
+       }
        network_process_list(sc, msg, &delete_after_send);
        network_process_digest(sc, msg, &delete_after_send);
        network_process_participate(sc, msg, &delete_after_send);