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

  Modified files:        (Branch: DEVEL_PDKIM)
    exim-src/src         acl.c 
  Log:
  The last bits of DKIM support

  Revision  Changes    Path
  1.82.2.3  +36 -0     exim/exim-src/src/acl.c

  Index: acl.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/acl.c,v
  retrieving revision 1.82.2.2
  retrieving revision 1.82.2.3
  diff -u -r1.82.2.2 -r1.82.2.3
  --- acl.c    20 May 2009 14:30:14 -0000    1.82.2.2
  +++ acl.c    9 Jun 2009 14:19:56 -0000    1.82.2.3
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/acl.c,v 1.82.2.2 2009/05/20 14:30:14 tom Exp $ */
  +/* $Cambridge: exim/exim-src/src/acl.c,v 1.82.2.3 2009/06/09 14:19:56 tom Exp $ */

   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -65,6 +65,10 @@
   #ifdef WITH_OLD_DEMIME
          ACLC_DEMIME,
   #endif
  +#ifndef DISABLE_DKIM
  +       ACLC_DKIM_SIGNER,
  +       ACLC_DKIM_STATUS,
  +#endif
          ACLC_DNSLISTS,
          ACLC_DOMAINS,
          ACLC_ENCRYPTED,
  @@ -123,6 +127,10 @@
   #ifdef WITH_OLD_DEMIME
     US"demime",
   #endif
  +#ifndef DISABLE_DKIM
  +  US"dkim_signer",
  +  US"dkim_status",
  +#endif
     US"dnslists",
     US"domains",
     US"encrypted",
  @@ -243,6 +251,10 @@
   #ifdef WITH_OLD_DEMIME
     TRUE,    /* demime */
   #endif
  +#ifndef DISABLE_DKIM
  +  TRUE,    /* dkim_signer */
  +  TRUE,    /* dkim_status */
  +#endif
     TRUE,    /* dnslists */
     FALSE,   /* domains */
     FALSE,   /* encrypted */
  @@ -299,6 +311,10 @@
   #ifdef WITH_OLD_DEMIME
     FALSE,   /* demime */
   #endif
  +#ifndef DISABLE_DKIM
  +  FALSE,   /* dkim_signer */
  +  FALSE,   /* dkim_status */
  +#endif
     FALSE,   /* dnslists */
     FALSE,   /* domains */
     FALSE,   /* encrypted */
  @@ -388,6 +404,14 @@
     ~((1<<ACL_WHERE_DATA)|(1<<ACL_WHERE_NOTSMTP)),   /* demime */
     #endif

  +  #ifndef DISABLE_DKIM
  +  (unsigned int)
  +  ~(1<<ACL_WHERE_DKIM),                            /* dkim_signer */
  +
  +  (unsigned int)
  +  ~(1<<ACL_WHERE_DKIM),                            /* dkim_status */
  +  #endif
  +
     (1<<ACL_WHERE_NOTSMTP)|                          /* dnslists */
       (1<<ACL_WHERE_NOTSMTP_START),

  @@ -2760,6 +2784,18 @@
       break;
       #endif

  +    #ifndef DISABLE_DKIM
  +    case ACLC_DKIM_SIGNER:
  +    rc = match_isinlist(dkim_signing_domain,
  +                        &arg,0,NULL,NULL,MCL_STRING,TRUE,NULL);
  +    break;
  +
  +    case ACLC_DKIM_STATUS:
  +    rc = match_isinlist(dkim_exim_expand_query(DKIM_VERIFY_STATUS),
  +                        &arg,0,NULL,NULL,MCL_STRING,TRUE,NULL);
  +    break;
  +    #endif
  +
       case ACLC_DNSLISTS:
       rc = verify_check_dnsbl(&arg);
       break;