Fixed a bug in the new aliasing code that broke mail to rooms with spaces in their...

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 2e1dd06b4adc4a60e8434f5f644d9524c05bdbb1..4292725868445f8148e7eec2fe1465c580f88251 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -624,12 +624,12 @@ struct recptypes *validate_recipients(char *supplied_recipients, const char *Rem
                                                if (!IsEmptyStr(ret->recp_room)) {
                                                        strcat(ret->recp_room, "|");
                                                }
-                                               strcat(ret->recp_room, &this_recp[5]);
+                                               strcat(ret->recp_room, CC->room.QRname);
        
                                                if (!IsEmptyStr(ret->recp_orgroom)) {
                                                        strcat(ret->recp_orgroom, "|");
                                                }
-                                               strcat(ret->recp_orgroom, org_recp);
+                                               strcat(ret->recp_orgroom, this_recp);
        
                                        }
                                }

diff --git a/citadel/modules/ctdlproto/serv_messages.c b/citadel/modules/ctdlproto/serv_messages.c
index 11d61e946fde24f569e74a510aa772afad6aa176..af40c304b1ae2b341e6bd391f229114a5bbe9888 100644 (file)
--- a/citadel/modules/ctdlproto/serv_messages.c
+++ b/citadel/modules/ctdlproto/serv_messages.c
@@ -639,12 +639,9 @@ void cmd_ent0(char *entargs) {
        }
        free(all_recps);
 
-       if ((valid != NULL) && (valid->num_room == 1) && !IsEmptyStr(valid->recp_orgroom))
-       {
-               /* posting into an ML room? set the envelope from 
-                * to the actual mail address so others get a valid
-                * reply-to-header.
-                */
+       // posting into a mailing list room? set the envelope from 
+       // to the actual mail address so others get a valid reply-to-header.
+       if ((valid != NULL) && (valid->num_room == 1) && !IsEmptyStr(valid->recp_orgroom)) {
                CM_SetField(msg, eenVelopeTo, valid->recp_orgroom, strlen(valid->recp_orgroom));
        }