diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-01-04 11:01:33 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-01-04 11:01:33 +0000 |
| commit | 86b8287f4bac50522d7c4ff99429979584944bab (patch) | |
| tree | 31f86908b83a20cd2987da590a0d036bd83b4e06 | |
| parent | d95f9fdbbc934eb921bdf989bda1139415ef7d91 (diff) | |
A call to exiwhat no longer cuts short ACL delays set by the "delay"
modifier.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 5 | ||||
| -rw-r--r-- | src/src/acl.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 297303ad6..3e8b8d935 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.61 2005/01/04 10:37:55 ph10 Exp $ +$Cambridge: 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 ------------------------------------------- @@ -281,6 +281,9 @@ Exim version 4.50 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 ----------------- diff --git a/src/src/acl.c b/src/src/acl.c index 014721f12..14fd2a072 100644 --- a/src/src/acl.c +++ b/src/src/acl.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/acl.c,v 1.11 2005/01/04 10:00:42 ph10 Exp $ */ +/* $Cambridge: 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 @@ for (; cb != NULL; cb = cb->next) HDEBUG(D_acl) debug_printf("delay skipped in -bh checking mode\n"); } - else sleep(delay); + else + { + while (delay > 0) delay = sleep(delay); + } } } break; |