From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Tue, 25 Apr 2006 10:44:57 +0000 (+0000)
Subject: Small patch from the Sieve maintainer.
X-Git-Tag: exim-4_62~4
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=bfad52369be0acea540991e0af05037b6408fabc

Small patch from the Sieve maintainer.
---

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 60e901aac..d2ba436ee 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.346 2006/04/25 10:06:30 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.347 2006/04/25 10:44:57 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -40,6 +40,8 @@ PH/07 The appendfile transport was creating MBX lock files with a fixed mode
       of 0600. This has been changed to use the value of the lockfile_mode
       option (which defaults to 0600).
 
+PH/08 Applied small patch from the Sieve maintainer.
+
 
 Exim version 4.61
 -----------------
diff --git a/doc/doc-txt/README.SIEVE b/doc/doc-txt/README.SIEVE
index 9209dac88..42c9cbf5d 100644
--- a/doc/doc-txt/README.SIEVE
+++ b/doc/doc-txt/README.SIEVE
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/README.SIEVE,v 1.9 2005/11/21 10:09:13 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/README.SIEVE,v 1.10 2006/04/25 10:44:57 ph10 Exp $
 
               Notes on the Sieve implementation for Exim
 
@@ -20,11 +20,12 @@ then there is no way around it.
 
 Exim Implementation
 
-The Exim Sieve implementation offers the core as defined by draft
-3028bis-4 (next version of RFC 3028 that fixes specification mistakes),
-the "envelope" (3028bis), the "fileinto" (3028bis), the "copy" (RFC 3894)
-and the "vacation" (draft-ietf-sieve-vacation-04.txt) extension, the
-"i;ascii-numeric" comparator (RFC 2244).
+The Exim Sieve implementation offers the core as defined by
+draft-ietf-sieve-3028bis-05.txt (next version of RFC 3028 that fixes
+specification mistakes), the "envelope" test (3028bis), the "fileinto"
+action (3028bis), the "copy" action (RFC 3894), the "vacation" action
+(draft-ietf-sieve-vacation-05.txt) and the "i;ascii-numeric" comparator
+extension (RFC 2244).
 
 The Sieve filter is integrated in Exim and works very similar to the
 Exim filter: Sieve scripts are recognized by the first line containing
diff --git a/src/src/sieve.c b/src/src/sieve.c
index 5ad1bbebd..1dcb7795f 100644
--- a/src/src/sieve.c
+++ b/src/src/sieve.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/sieve.c,v 1.20 2006/04/04 08:35:39 ph10 Exp $ */
+/* $Cambridge: exim/src/src/sieve.c,v 1.21 2006/04/25 10:44:57 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -2583,6 +2583,7 @@ while (*filter->pc)
           {
           debug_printf("Notification to `%s'.\n",method.character);
           }
+#ifndef COMPILE_SYNTAX_CHECKER
         if (exec)
           {
           string_item *p;
@@ -2606,6 +2607,7 @@ while (*filter->pc)
             (void)child_close(pid, 0);
             }
           }
+#endif
         }
       else
         {