Sieve buglet: now it explicitly sets From: when generating an autoreply.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 32606ba91cf162a3bda9ee9051a21c2d8b94e901..6cdc44cc60de619e40fd7aaf6e8fd2e3af77f785 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.48 2004/12/21 09:26:31 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.49 2004/12/21 09:40:01 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -207,6 +207,9 @@ Exim version 4.50
     (the order specifies the preference for clients). The order is now AES256,
     AES128, 3DES, ARCFOUR128.
 
+51. Small patch to Sieve code - explicitly set From: when generating an
+    autoreply.
+
 
 Exim version 4.43
 -----------------

diff --git a/src/src/exim.h b/src/src/exim.h
index f7a4f7115cf89cffa5eff010cc076b588b671bd0..fa7acf8bade29c364f803c4b19634d4f9d3e44b9 100644 (file)
--- a/src/src/exim.h
+++ b/src/src/exim.h
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/exim.h,v 1.4 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/src/src/exim.h,v 1.5 2004/12/21 09:40:01 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -381,10 +381,12 @@ extern int ferror(FILE *);
 
 /* Exim includes are in several files. Note that local_scan.h #includes
 mytypes.h and store.h, so we don't need to mention them explicitly. */
+
 #include "config.h"
 
-/* Before including the rest of the Exim headers, lets clear up some content
+/* Before including the rest of the Exim headers, let's clear up some content
 scanning dependencies. */
+
 #ifdef WITH_OLD_DEMIME
 #define WITH_CONTENT_SCAN
 #endif

diff --git a/src/src/sieve.c b/src/src/sieve.c
index c684e34a9de4f086e9ae7177b156368d618a9c85..629c73b3fa1fb8e7168a6afd46618adcd52d8392 100644 (file)
--- a/src/src/sieve.c
+++ b/src/src/sieve.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/sieve.c,v 1.2 2004/11/25 13:54:31 ph10 Exp $ */
+/* $Cambridge: exim/src/src/sieve.c,v 1.3 2004/12/21 09:40:01 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -2514,6 +2514,7 @@ while (*filter->pc)
         addr->reply = store_get(sizeof(reply_item));
         memset(addr->reply,0,sizeof(reply_item)); /* XXX */
         addr->reply->to = string_copy(sender_address);
+        addr->reply->from = expand_string(US"$local_part@$domain"); 
         /* Allocation is larger than neccessary, but enough even for split MIME words */
         buffer_capacity=16+4*subject.length;
         buffer=store_get(buffer_capacity);