diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/exim.h | 6 | ||||
| -rw-r--r-- | src/src/sieve.c | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/src/exim.h b/src/src/exim.h index f7a4f7115..fa7acf8ba 100644 --- 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 c684e34a9..629c73b3f 100644 --- 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); |