X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/a2da3176aa39ec9aa5ae495e5a6d533477f871aa..2c0f3ea1858d9dafc8600f9d97bc6e57594c22d0:/src/exim_monitor/em_queue.c diff --git a/src/exim_monitor/em_queue.c b/src/exim_monitor/em_queue.c index 893e43898..4bdc57ab9 100644 --- a/src/exim_monitor/em_queue.c +++ b/src/exim_monitor/em_queue.c @@ -656,32 +656,23 @@ if (jread != NULL) been delivered, and removing visible names. In the nonrecipients tree, domains are lower cased. */ -if (recipients_list != NULL) - { +if (recipients_list) for (i = 0; i < recipients_count; i++) { - uschar *pp; - uschar *r = recipients_list[i].address; - tree_node *node = tree_search(tree_nonrecipients, r); + uschar * pp; + uschar * r = recipients_list[i].address; + tree_node * node; - if (node == NULL) - { - uschar temp[256]; - uschar *rr = temp; - Ustrcpy(temp, r); - while (*rr != 0 && *rr != '@') rr++; - while (*rr != 0) { *rr = tolower(*rr); rr++; } - node = tree_search(tree_nonrecipients, temp); - } + if (!(node = tree_search(tree_nonrecipients, r))) + node = tree_search(tree_nonrecipients, string_copylc(r)); - if ((pp = strstric(r+1, qualify_domain, FALSE)) != NULL && - *(--pp) == '@') *pp = 0; - if (node == NULL) + if ((pp = strstric(r+1, qualify_domain, FALSE)) && *(--pp) == '@') + *pp = 0; + if (!node) (void)find_dest(p, r, dest_add, FALSE); else (void)find_dest(p, r, dest_remove, FALSE); } - } /* We also need to scan the tree of non-recipients, which might contain child addresses that are not in the recipients list, but