diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-03-16 12:07:55 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-03-16 12:07:55 +0000 |
| commit | b37c4101bb17c8f45d804ebedd9db003a5a3293c (patch) | |
| tree | 4d4b3ee40f78920f63d8b165d4a532a65ed32261 | |
| parent | 3d240ff7fc19b7a28641d2aaa6999ac30ccd5a64 (diff) | |
Fix $address_data after verification redirect then defer/fail bug.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 8 | ||||
| -rw-r--r-- | src/ACKNOWLEDGMENTS | 5 | ||||
| -rw-r--r-- | src/src/verify.c | 3 |
3 files changed, 12 insertions, 4 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index b1a7c3904..675728855 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.329 2006/03/16 11:51:09 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.330 2006/03/16 12:07:55 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -308,6 +308,12 @@ PH/60 When a VRFY deferred or FAILED, the log message rather than the user PH/61 Add -l and -k options to exicyclog. +PH/62 When verifying, if an address was redirected to one new address, so that + verification continued, and the new address failed or deferred after + having set something in $address_data, the value of $address_data was not + passed back to the ACL. This was different to the case when no + redirection occurred. The value is now passed back in both cases. + Exim version 4.60 ----------------- diff --git a/src/ACKNOWLEDGMENTS b/src/ACKNOWLEDGMENTS index 279f9fc8c..fe9ac9d35 100644 --- a/src/ACKNOWLEDGMENTS +++ b/src/ACKNOWLEDGMENTS @@ -1,4 +1,4 @@ -$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.43 2006/03/16 11:51:09 ph10 Exp $ +$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.44 2006/03/16 12:07:55 ph10 Exp $ EXIM ACKNOWLEDGEMENTS @@ -177,8 +177,9 @@ Chris Liddiard Fix for bug in exiqsumm Chris Lightfoot Patch for -restore-times in exim_lock Edgar Lovecraft Patch for ${str2b64: Torsten Luettgert Suggested patch for proper integer overflow detection -Lars Mainka Patch for OpenSSL crl collections David Madole Patch for SPA forced expansion failure bug +Lars Mainka Patch for OpenSSL crl collections +Andrey Malyshev Patch for $address_data after redirection bug Lionel Elie Mamane Patch for IPv4/IPv6 listen() problem on USAGI Linux Patch for recognizing IPv6 "scoped addresses" Patch for callout caching bug diff --git a/src/src/verify.c b/src/src/verify.c index b33ebb6df..8776700a0 100644 --- a/src/src/verify.c +++ b/src/src/verify.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/verify.c,v 1.34 2006/02/21 16:24:19 ph10 Exp $ */ +/* $Cambridge: exim/src/src/verify.c,v 1.35 2006/03/16 12:07:55 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -793,6 +793,7 @@ if (addr != vaddr) vaddr->user_message = addr->user_message; vaddr->basic_errno = addr->basic_errno; vaddr->more_errno = addr->more_errno; + vaddr->p.address_data = addr->p.address_data; } return yield; } |