summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2005-11-14 15:28:48 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2005-11-14 15:28:48 +0000
commit3e46c1aa025624c859503f0c33b9a449d5f9ea93 (patch)
treeb1e6ac4f6559728a2fe901d13e4756e007575f92
parent456682f5dbf8f8f9a97b3f1cebf07d4770b834b2 (diff)
Added "${if def:sender_address {(envelope-from <$sender_address>)\n\t}}"
to the default Received: header.
-rw-r--r--doc/doc-txt/ChangeLog9
-rw-r--r--src/src/globals.c3
2 files changed, 9 insertions, 3 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 2215122b5..1f0b5dbd1 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.258 2005/11/14 13:56:49 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.259 2005/11/14 15:28:48 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -117,7 +117,8 @@ PH/10 Exim was violating RFC 3834 ("Recommendations for Automatic Responses to
processes, except for messages which are automatic responses to
other messages.
-
+PH/11 Added "${if def:sender_address {(envelope-from <$sender_address>)\n\t}}"
+ to the default Received: header definition.
Exim version 4.54
@@ -147,6 +148,10 @@ TF/01 The control=submission/name=... option had a problem with syntax
PH/05 Some modifications to the interface to the fake nameserver for the new
testing suite.
+PH/06 Add ${if def:sender_address {(envelope-from <$sender_address>)\n\t}}
+ into the default Received: header string.
+
+
Exim version 4.53
-----------------
diff --git a/src/src/globals.c b/src/src/globals.c
index 3a5b2af1c..28026362b 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/globals.c,v 1.39 2005/09/28 10:46:48 ph10 Exp $ */
+/* $Cambridge: exim/src/src/globals.c,v 1.40 2005/11/14 15:28:48 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -833,6 +833,7 @@ uschar *received_header_text = US
"${if def:tls_cipher {($tls_cipher)\n\t}}"
#endif
"(Exim $version_number)\n\t"
+ "${if def:sender_address {(envelope-from <$sender_address>)\n\t}}"
"id $message_exim_id"
"${if def:received_for {\n\tfor $received_for}}"
"\0<---------------Space to patch received_header_text->";