ph10 2006/03/16 12:07:55 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src ACKNOWLEDGMENTS
exim-src/src verify.c
Log:
Fix $address_data after verification redirect then defer/fail bug.
Revision Changes Path
1.330 +6 -0 exim/exim-doc/doc-txt/ChangeLog
1.44 +2 -1 exim/exim-src/ACKNOWLEDGMENTS
1.35 +1 -0 exim/exim-src/src/verify.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- ChangeLog 16 Mar 2006 11:51:09 -0000 1.329
+++ ChangeLog 16 Mar 2006 12:07:55 -0000 1.330
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.329 2006/03/16 11:51:09 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -307,6 +307,12 @@
message was being sent as an SMTP response.
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
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ACKNOWLEDGMENTS 16 Mar 2006 11:51:09 -0000 1.43
+++ ACKNOWLEDGMENTS 16 Mar 2006 12:07:55 -0000 1.44
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.43 2006/03/16 11:51:09 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.44 2006/03/16 12:07:55 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -177,8 +177,9 @@
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
Index: verify.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/verify.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- verify.c 21 Feb 2006 16:24:19 -0000 1.34
+++ verify.c 16 Mar 2006 12:07:55 -0000 1.35
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/verify.c,v 1.34 2006/02/21 16:24:19 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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;
}
