ph10 2005/04/07 11:02:02 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src ACKNOWLEDGMENTS
exim-src/src sieve.c
Log:
Patch for sieve envelope tests bug (supplied by Bob Johannessen,
sanctioned by Michael Haardt).
Revision Changes Path
1.120 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.21 +2 -1 exim/exim-src/ACKNOWLEDGMENTS
1.10 +1 -1 exim/exim-src/src/sieve.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- ChangeLog 6 Apr 2005 16:43:59 -0000 1.119
+++ ChangeLog 7 Apr 2005 10:02:02 -0000 1.120
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.119 2005/04/06 16:43:59 ph10 Exp $
+$Cambridge: exim/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/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
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ACKNOWLEDGMENTS 5 Apr 2005 14:33:27 -0000 1.20
+++ ACKNOWLEDGMENTS 7 Apr 2005 10:02:02 -0000 1.21
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.20 2005/04/05 14:33:27 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.21 2005/04/07 10:02:02 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -20,7 +20,7 @@
Philip Hazel
Lists created: 20 November 2002
-Last updated: 05 April 2005
+Last updated: 07 April 2005
THE OLD LIST
@@ -153,6 +153,7 @@
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
Index: sieve.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/sieve.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sieve.c 6 Apr 2005 14:40:24 -0000 1.9
+++ sieve.c 7 Apr 2005 10:02:02 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/sieve.c,v 1.9 2005/04/06 14:40:24 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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;
}
