Now it also works when receiving messages over SMTP. Still need to eliminate dupes.

diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c
index 72b52b6808e20b17f35986ffe7743986f05aa2c3..9f5ae2c2f914c15dd6b14e03c0da704daf724b54 100644 (file)
--- a/citadel/internet_addressing.c
+++ b/citadel/internet_addressing.c
@@ -575,13 +575,16 @@ struct recptypes *validate_recipients(char *supplied_recipients, const char *Rem
        for (int r=0; (recp_array && r<array_len(recp_array)); ++r) {
                org_recp = (char *)array_get_element_at(recp_array, r);
                strncpy(this_recp, org_recp, sizeof this_recp);
-               mailtype = expand_aliases(this_recp, aliases);
-               syslog(LOG_DEBUG, "Recipient #%d of type %d is <%s>", r, mailtype, this_recp);
 
-               // If an alias expanded to multiple recipients, strip off those recipients and append them
-               // to the end of the array.  This loop will hit those again when it gets there.
-               if (mailtype == EA_MULTIPLE) {
-                       recp_array = split_recps(this_recp, recp_array);
+               for (int i=0; i<3; ++i) {                                               // pass three times through the aliaser
+                       mailtype = expand_aliases(this_recp, aliases);
+                       syslog(LOG_DEBUG, "Recipient #%d of type %d is <%s>", r, mailtype, this_recp);
+       
+                       // If an alias expanded to multiple recipients, strip off those recipients and append them
+                       // to the end of the array.  This loop will hit those again when it gets there.
+                       if (mailtype == EA_MULTIPLE) {
+                               recp_array = split_recps(this_recp, recp_array);
+                       }
                }
 
                invalid = 0;