more tiny merge misses

[citadel.git] / citadel / modules / network / serv_network.c

diff --git a/citadel/modules/network/serv_network.c b/citadel/modules/network/serv_network.c
index 9115b1fb4ee611620824b2c5d7031ac1a7c479da..7506a1abf372267158b71c6f6a918247353bed8a 100644 (file)
--- a/citadel/modules/network/serv_network.c
+++ b/citadel/modules/network/serv_network.c
@@ -743,16 +743,20 @@ void network_spool_msg(long msgnum, void *userdata) {
 
                        /* else we won't modify the buffer, since the roomname is already here. */
 
-                       /* if we don't already have a 'reply to' field, put our roomname in. */
-                       if (msg->cm_fields['K'] == NULL) {
-                               msg->cm_fields['K'] = malloc(256);
-                               snprintf(msg->cm_fields['K'], 256,
-                                        "room_%s@%s", CC->room.QRname,
-                                        config.c_fqdn);
-                               for (i=0; msg->cm_fields['K'][i]; ++i) {
-                                       if (isspace(msg->cm_fields['K'][i])) {
-                                               msg->cm_fields['K'][i] = '_';
-                                       }
+                       /* Set the recipient of the list message to the
+                        * email address of the room itself.
+                        * FIXME ... I want to be able to pick any address
+                        */
+                       if (msg->cm_fields['R'] != NULL) {
+                               free(msg->cm_fields['R']);
+                       }
+                       msg->cm_fields['R'] = malloc(256);
+                       snprintf(msg->cm_fields['R'], 256,
+                               "room_%s@%s", CC->room.QRname,
+                               config.c_fqdn);
+                       for (i=0; msg->cm_fields['R'][i]; ++i) {
+                               if (isspace(msg->cm_fields['R'][i])) {
+                                       msg->cm_fields['R'][i] = '_';
                                }
                        }