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

Góra strony
Delete this message
Reply to this message
Autor: Magnus Holmgren
Data:  
Dla: exim-cvs
Temat: [exim-cvs] cvs commit: exim/exim-src/src expand.c receive.c exim/exim-doc/doc-txt ChangeLog
magnus 2007/02/16 22:23:35 GMT

  Modified files:
    exim-src/src         expand.c receive.c 
    exim-doc/doc-txt     ChangeLog 
  Log:
  I took action and made $recipients available in local_scan(),
  something I asked about a while ago and was told that the only
  reason it was not available is that nobody asked for it yet.


  Revision  Changes    Path
  1.481     +4 -0      exim/exim-doc/doc-txt/ChangeLog
  1.83      +2 -1      exim/exim-src/src/expand.c
  1.34      +4 -4      exim/exim-src/src/receive.c


  Index: expand.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/expand.c,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- expand.c    14 Feb 2007 14:59:02 -0000    1.82
  +++ expand.c    16 Feb 2007 22:23:35 -0000    1.83
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/expand.c,v 1.82 2007/02/14 14:59:02 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/expand.c,v 1.83 2007/02/16 22:23:35 magnus Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -349,7 +349,8 @@
     vtype_localpart,      /* extract local part from string */
     vtype_domain,         /* extract domain from string */
     vtype_recipients,     /* extract recipients from recipients list */
  -                        /* (enabled only during system filtering */
  +                        /* (available only in system filters, ACLs, and */
  +                        /* local_scan()) */
     vtype_todbsdin,       /* value not used; generate BSD inbox tod */
     vtype_tode,           /* value not used; generate tod in epoch format */
     vtype_todf,           /* value not used; generate full tod */


  Index: receive.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/receive.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- receive.c    22 Jan 2007 16:29:54 -0000    1.33
  +++ receive.c    16 Feb 2007 22:23:35 -0000    1.34
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/receive.c,v 1.33 2007/01/22 16:29:54 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/receive.c,v 1.34 2007/02/16 22:23:35 magnus Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -2915,14 +2915,14 @@
   deliver_datafile = data_fd;
   user_msg = NULL;


  +enable_dollar_recipients = TRUE;
  +
   if (recipients_count == 0)
     {
     blackholed_by = recipients_discarded? US"MAIL ACL" : US"RCPT ACL";
     }
   else
     {
  -  enable_dollar_recipients = TRUE;
  -
     /* Handle interactive SMTP messages */


     if (smtp_input && !smtp_batched_input)
  @@ -3027,8 +3027,6 @@


     if (deliver_freeze) frozen_by = US"ACL";     /* for later logging */
     if (queue_only_policy) queued_by = US"ACL";
  -
  -  enable_dollar_recipients = FALSE;
     }


#ifdef WITH_CONTENT_SCAN
@@ -3059,6 +3057,8 @@
rc = local_scan(data_fd, &local_scan_data);
alarm(0);
os_non_restarting_signal(SIGALRM, sigalrm_handler);
+
+enable_dollar_recipients = FALSE;

store_pool = POOL_MAIN; /* In case changed */
DEBUG(D_receive) debug_printf("local_scan() returned %d %s\n", rc,

  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.480
  retrieving revision 1.481
  diff -u -r1.480 -r1.481
  --- ChangeLog    14 Feb 2007 15:33:40 -0000    1.480
  +++ ChangeLog    16 Feb 2007 22:23:35 -0000    1.481
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.480 2007/02/14 15:33:40 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.481 2007/02/16 22:23:35 magnus Exp $


Change log file for Exim from version 4.21
-------------------------------------------
@@ -108,6 +108,10 @@

   PH/26 Added a "continue" ACL modifier that does nothing, for the benefit of its
         expansion side effects.
  +
  +MH/03 Made $recipients available in local_scan(). local_scan() already has
  +      better access to the recipient list through recipients_list[], but
  +      $recipients can be useful in postmaster-provided expansion strings.



Exim version 4.66