[exim-cvs] cvs commit: exim/exim-src/src globals.c globals.h…

Góra strony
Delete this message
Reply to this message
Autor: Tom Kistner
Data:  
Dla: exim-cvs
Temat: [exim-cvs] cvs commit: exim/exim-src/src globals.c globals.h readconf.c receive.c
tom 2009/06/09 19:38:35 BST

  Modified files:        (Branch: DEVEL_PDKIM)
    exim-src/src         globals.c globals.h readconf.c receive.c 
  Log:
  rename main option


  Revision  Changes    Path
  1.81.2.6  +1 -1      exim/exim-src/src/globals.c
  1.62.2.5  +1 -1      exim/exim-src/src/globals.h
  1.35.2.3  +1 -1      exim/exim-src/src/readconf.c
  1.45.2.6  +7 -7      exim/exim-src/src/receive.c


  Index: globals.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/globals.c,v
  retrieving revision 1.81.2.5
  retrieving revision 1.81.2.6
  diff -u -r1.81.2.5 -r1.81.2.6
  --- globals.c    27 May 2009 17:26:54 -0000    1.81.2.5
  +++ globals.c    9 Jun 2009 18:38:35 -0000    1.81.2.6
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/globals.c,v 1.81.2.5 2009/05/27 17:26:54 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/globals.c,v 1.81.2.6 2009/06/09 18:38:35 tom Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -535,7 +535,7 @@
   uschar *dkim_signing_domains     = NULL;
   uschar *dkim_signing_domain      = NULL;
   uschar *dkim_signing_selector    = NULL;
  -uschar *dkim_verify_domains      = US"$dkim_signing_domains";
  +uschar *dkim_verify_signers      = US"$dkim_signing_domains";
   BOOL    dkim_collect_input       = FALSE;
   BOOL    dkim_disable_verify      = FALSE;
   #endif


  Index: globals.h
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/globals.h,v
  retrieving revision 1.62.2.4
  retrieving revision 1.62.2.5
  diff -u -r1.62.2.4 -r1.62.2.5
  --- globals.h    27 May 2009 17:26:54 -0000    1.62.2.4
  +++ globals.h    9 Jun 2009 18:38:35 -0000    1.62.2.5
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/globals.h,v 1.62.2.4 2009/05/27 17:26:54 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/globals.h,v 1.62.2.5 2009/06/09 18:38:35 tom Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -302,7 +302,7 @@
   extern uschar *dkim_signing_domains;   /* Expansion variable, holds colon-separated list of domains that have signed a message */
   extern uschar *dkim_signing_domain;    /* Expansion variable, domain used for signing a message. */
   extern uschar *dkim_signing_selector;  /* Expansion variable, selector used for signing a message. */
  -extern uschar *dkim_verify_domains;    /* Colon-separated list of domains for each of which we call the DKIM ACL */
  +extern uschar *dkim_verify_signers;    /* Colon-separated list of domains for each of which we call the DKIM ACL */
   extern BOOL    dkim_collect_input;     /* Runtime flag that tracks wether SMTP input is fed to DKIM validation */
   extern BOOL    dkim_disable_verify;    /* Set via ACL control statement. When set, DKIM verification is disabled for the current message */
   #endif


  Index: readconf.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/readconf.c,v
  retrieving revision 1.35.2.2
  retrieving revision 1.35.2.3
  diff -u -r1.35.2.2 -r1.35.2.3
  --- readconf.c    27 May 2009 17:26:55 -0000    1.35.2.2
  +++ readconf.c    9 Jun 2009 18:38:35 -0000    1.35.2.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/readconf.c,v 1.35.2.2 2009/05/27 17:26:55 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/readconf.c,v 1.35.2.3 2009/06/09 18:38:35 tom Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -209,7 +209,7 @@
   #endif
     { "disable_ipv6",             opt_bool,        &disable_ipv6 },
   #ifndef DISABLE_DKIM
  -  { "dkim_verify_domains",      opt_stringptr,   &dkim_verify_domains },
  +  { "dkim_verify_signers",      opt_stringptr,   &dkim_verify_signers },
   #endif
     { "dns_again_means_nonexist", opt_stringptr,   &dns_again_means_nonexist },
     { "dns_check_names_pattern",  opt_stringptr,   &check_dns_names_pattern },


  Index: receive.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/receive.c,v
  retrieving revision 1.45.2.5
  retrieving revision 1.45.2.6
  diff -u -r1.45.2.5 -r1.45.2.6
  --- receive.c    8 Jun 2009 21:06:32 -0000    1.45.2.5
  +++ receive.c    9 Jun 2009 18:38:35 -0000    1.45.2.6
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/receive.c,v 1.45.2.5 2009/06/08 21:06:32 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/receive.c,v 1.45.2.6 2009/06/09 18:38:35 tom Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -2977,21 +2977,21 @@


         /* Check if we must run the DKIM ACL */
         if ((acl_smtp_dkim != NULL) &&
  -          (dkim_verify_domains != NULL) &&
  -          (dkim_verify_domains[0] != '\0'))
  +          (dkim_verify_signers != NULL) &&
  +          (dkim_verify_signers[0] != '\0'))
           {
  -        uschar *dkim_verify_domains_expanded =
  -          expand_string(dkim_verify_domains);
  -        if (dkim_verify_domains_expanded == NULL)
  +        uschar *dkim_verify_signers_expanded =
  +          expand_string(dkim_verify_signers);
  +        if (dkim_verify_signers_expanded == NULL)
             {
             log_write(0, LOG_MAIN|LOG_PANIC,
  -            "expansion of dkim_verify_domains option failed: %s",
  +            "expansion of dkim_verify_signers option failed: %s",
               expand_string_message);
             }
           else
             {
             int sep = 0;
  -          uschar *ptr = dkim_verify_domains_expanded;
  +          uschar *ptr = dkim_verify_signers_expanded;
             uschar *item = NULL;
             uschar itembuf[256];
             while ((item = string_nextinlist(&ptr, &sep,