[exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim…

Kezdőlap
Üzenet törlése
Válasz az üzenetre
Szerző: Philip Hazel
Dátum:  
Címzett: exim-cvs
Tárgy: [exim-cvs] cvs commit: exim/exim-doc/doc-txt ChangeLog exim/exim-src/src acl.c
ph10 2005/01/04 11:01:33 GMT

  Modified files:
    exim-doc/doc-txt     ChangeLog 
    exim-src/src         acl.c 
  Log:
  A call to exiwhat no longer cuts short ACL delays set by the "delay"
  modifier.


  Revision  Changes    Path
  1.62      +3 -0      exim/exim-doc/doc-txt/ChangeLog
  1.12      +4 -1      exim/exim-src/src/acl.c


  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- ChangeLog    4 Jan 2005 10:37:55 -0000    1.61
  +++ ChangeLog    4 Jan 2005 11:01:33 -0000    1.62
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.61 2005/01/04 10:37:55 ph10 Exp $
  +$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.62 2005/01/04 11:01:33 ph10 Exp $


   Change log file for Exim from version 4.21
   -------------------------------------------
  @@ -280,6 +280,9 @@
       deliver_queue_load_max is set with deliver_drop_privilege. This is
       necessary for the benefit of the queue runner, because there is no re-exec
       when deliver_drop_privilege is set.
  +
  +64. A call to exiwhat cut short delays set up by "delay" modifiers in ACLs.
  +    This has been fixed.



Exim version 4.43

  Index: acl.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/acl.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- acl.c    4 Jan 2005 10:00:42 -0000    1.11
  +++ acl.c    4 Jan 2005 11:01:33 -0000    1.12
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/acl.c,v 1.11 2005/01/04 10:00:42 ph10 Exp $ */
  +/* $Cambridge: exim/exim-src/src/acl.c,v 1.12 2005/01/04 11:01:33 ph10 Exp $ */


   /*************************************************
   *     Exim - an Internet mail transport agent    *
  @@ -1728,7 +1728,10 @@
             HDEBUG(D_acl)
               debug_printf("delay skipped in -bh checking mode\n");
             }
  -        else sleep(delay);
  +        else 
  +          {
  +          while (delay > 0) delay = sleep(delay);
  +          } 
           }
         }
       break;