From: Tom Kistner <tom@tahini.csx.cam.ac.uk>
Date: Sun, 8 May 2011 09:08:12 +0000 (+0100)
Subject: Merge branch 'tom_dev'
X-Git-Tag: exim-4_76_RC2~2
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/5fa5f96fcfb9aa3c73e4ce9289a30be1e616e576?hp=43236f357ba2001d59b5937d14a50a56478bb8e0

Merge branch 'tom_dev'
---

diff --git a/src/src/receive.c b/src/src/receive.c
index 914b1d281..f331d2ae5 100644
--- a/src/src/receive.c
+++ b/src/src/receive.c
@@ -3022,14 +3022,29 @@ else
                appears in the expanded list. */
             if (seen_items != NULL)
               {
+              uschar *seen_item = NULL;
+              uschar seen_item_buf[256];
               uschar *seen_items_list = seen_items;
-              if (match_isinlist(item,
-                    &seen_items_list,0,NULL,NULL,MCL_STRING,TRUE,NULL) == OK)
+              int seen_this_item = 0;
+              
+              while ((seen_item = string_nextinlist(&seen_items_list, &sep,
+                                                    seen_item_buf,
+                                                    sizeof(seen_item_buf))) != NULL)
+                {
+                  if (Ustrcmp(seen_item,item) == 0)
+                    {
+                      seen_this_item = 1;
+                      break;
+                    } 
+                }
+
+              if (seen_this_item > 0)
                 {
                 DEBUG(D_receive)
                   debug_printf("acl_smtp_dkim: skipping signer %s, already seen\n", item);
                 continue;
                 }
+              
               seen_items = string_append(seen_items,&seen_items_size,&seen_items_offset,1,":");
               }