Patch for sieve envelope tests bug (supplied by Bob Johannessen,

sanctioned by Michael Haardt).

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 08f59181fdf9b1cd43d7e71479f9ae6182062b41..3a18813c035b1b0c9005a3c2bf5c2e0d1430191a 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.119 2005/04/06 16:43:59 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.120 2005/04/07 10:02:02 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -199,6 +199,8 @@ PH/31 When doing a callout as part of verifying an address, Exim was not paying
 PH/32 Add the sender address, as F=<...>, to the log line when logging a
       timeout during the DATA phase of an incoming message.
 
+PH/33 Sieve envelope tests were broken for match types other than :is. I have
+      applied a patch sanctioned by the Sieve maintainer.
 
 
 A note about Exim versions 4.44 and 4.50

diff --git a/src/ACKNOWLEDGMENTS b/src/ACKNOWLEDGMENTS
index 86bc64f60827a05c8669ba798a5a3cecfe6e76b8..e2ec4982cff66c9e6738f7d3029bc2401579c2a2 100644 (file)
--- a/src/ACKNOWLEDGMENTS
+++ b/src/ACKNOWLEDGMENTS
@@ -1,4 +1,4 @@
-$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.20 2005/04/05 14:33:27 ph10 Exp $
+$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.21 2005/04/07 10:02:02 ph10 Exp $
 
 EXIM ACKNOWLEDGEMENTS
 
@@ -20,7 +20,7 @@ relatively small patches.
 Philip Hazel
 
 Lists created: 20 November 2002
-Last updated:  05 April 2005
+Last updated:  07 April 2005
 
 
 THE OLD LIST
@@ -153,6 +153,7 @@ Tom Hughes                Suggested patch for $n bug in pipe command from filter
 Pierre Humblet            Continued Cygwin support
 Peter Ilieve              Suggested patch for lookup search bug
 John Jetmore              Writing and maintaining the 'exipick' utility
+Bob Johannessen           Patch for Sieve envelope tests bug
 Christian Kellner         Patch for LDAP dereferencing
 Alex Kiernan              Patch for libradius
                           Diagnosis of milliwait clock-backwards bug

diff --git a/src/src/sieve.c b/src/src/sieve.c
index cc3ad14a2d9920092b2b87223f722d5c73069973..cf87dfb1c819e71b0e382e8dcd24e2516f3af891 100644 (file)
--- a/src/src/sieve.c
+++ b/src/src/sieve.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/sieve.c,v 1.9 2005/04/06 14:40:24 ph10 Exp $ */
+/* $Cambridge: exim/src/src/sieve.c,v 1.10 2005/04/07 10:02:02 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -2054,7 +2054,7 @@ else if (parse_identifier(filter,CUS "envelope"))
 
         envelopeStr.character=envelope;
         envelopeStr.length=Ustrlen(envelope);
-        *cond=compare(filter,&envelopeStr,k,comparator,matchType);
+        *cond=compare(filter,k,&envelopeStr,comparator,matchType);
         if (*cond==-1) return -1;
         if (*cond) break;
         }