[exim-cvs] cvs commit: exim/exim-src/src receive.c

Startseite
Nachricht löschen
Nachricht beantworten
Autor: Tom Kistner
Datum:  
To: exim-cvs
Betreff: [exim-cvs] cvs commit: exim/exim-src/src receive.c
tom 2009/10/15 14:49:43 BST

  Modified files:
    exim-src/src         receive.c 
  Log:
  Fix dkim_cur_signer undupe logic


  Revision  Changes    Path
  1.49      +5 -3      exim/exim-src/src/receive.c


  Index: receive.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/receive.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- receive.c    15 Oct 2009 09:22:44 -0000    1.48
  +++ receive.c    15 Oct 2009 13:49:43 -0000    1.49
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/receive.c,v 1.48 2009/10/15 09:22:44 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/receive.c,v 1.49 2009/10/15 13:49:43 tom Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -3007,17 +3007,19 @@
                  appears in the expanded list. */
               if (seen_items != NULL)
                 {
  +              uschar *seen_items_list = seen_items;
                 if (match_isinlist(item,
  -                    &seen_items,0,NULL,NULL,MCL_STRING,TRUE,NULL) == OK)
  +                    &seen_items_list,0,NULL,NULL,MCL_STRING,TRUE,NULL) == OK)
                   {
                   DEBUG(D_receive)
                     debug_printf("acl_smtp_dkim: skipping signer %s, already seen\n", item);
                   continue;
                   }
  -              string_cat(seen_items,&seen_items_size,&seen_items_offset,":",1);
  +              seen_items = string_append(seen_items,&seen_items_size,&seen_items_offset,1,":");
                 }


  -            string_cat(seen_items,&seen_items_size,&seen_items_offset,item,Ustrlen(item));
  +            seen_items = string_append(seen_items,&seen_items_size,&seen_items_offset,1,item);
  +            seen_items[seen_items_offset] = '\0';


               DEBUG(D_receive)
                 debug_printf("calling acl_smtp_dkim for dkim_cur_signer=%s\n", item);