ph10 2004/12/21 09:40:01 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src exim.h sieve.c
exim-test-orig/AutoTest/mail 497.someone
Log:
Sieve buglet: now it explicitly sets From: when generating an autoreply.
Revision Changes Path
1.49 +3 -0 exim/exim-doc/doc-txt/ChangeLog
1.5 +3 -1 exim/exim-src/src/exim.h
1.3 +1 -0 exim/exim-src/src/sieve.c
1.2 +1 -1 exim/exim-test-orig/AutoTest/mail/497.someone
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ChangeLog 21 Dec 2004 09:26:31 -0000 1.48
+++ ChangeLog 21 Dec 2004 09:40:01 -0000 1.49
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.48 2004/12/21 09:26:31 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -206,6 +206,9 @@
50. The default ordering of permitted cipher suites for GnuTLS was pessimal
(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
Index: exim.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exim.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- exim.h 16 Dec 2004 15:11:47 -0000 1.4
+++ exim.h 21 Dec 2004 09:40:01 -0000 1.5
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/exim.h,v 1.4 2004/12/16 15:11:47 tom Exp $ */
+/* $Cambridge: exim/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 @@
/* 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
Index: sieve.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/sieve.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sieve.c 25 Nov 2004 13:54:31 -0000 1.2
+++ sieve.c 21 Dec 2004 09:40:01 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/sieve.c,v 1.2 2004/11/25 13:54:31 ph10 Exp $ */
+/* $Cambridge: exim/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 @@
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);
Index: 497.someone
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/497.someone,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 497.someone 8 Oct 2004 14:49:42 -0000 1.1
+++ 497.someone 21 Dec 2004 09:40:01 -0000 1.2
@@ -5,6 +5,7 @@
Received: from ph10 by mail.test.ex with local (Exim x.yz)
id 10HmbM-0005vi-00
for someone@???; Tue, 2 Mar 1999 09:44:33 +0000
+From: ph10@???
To: someone@???
Subject: =?utf-8?Q?Auto=3A_?=
In-Reply-To: <E10HmbL-0005vi-00@???>
@@ -14,7 +15,6 @@
charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Message-Id: <E10HmbM-0005vi-00@???>
-From: ph10@???
Date: Tue, 2 Mar 1999 09:44:33 +0000
I am gone. Not here.
