diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-08-01 14:00:34 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-08-01 14:00:34 +0000 |
| commit | 1ab52c6910907a13b2f1895f53f43d0255a39d35 (patch) | |
| tree | abe7c1fc8c055c4722ac248cf9c7e0b62d9fe199 /src | |
| parent | 5b68f6e43d7d8d07cbb8825c9520c20eaeac64b6 (diff) | |
Add $message_exim_id as a synonym for $message_id, which will now be
deprecated (it got confused with the Message-ID: header).
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/expand.c | 3 | ||||
| -rw-r--r-- | src/src/globals.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/src/expand.c b/src/src/expand.c index e4e0d21e8..86d410499 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/expand.c,v 1.37 2005/08/01 13:20:28 ph10 Exp $ */ +/* $Cambridge: exim/src/src/expand.c,v 1.38 2005/08/01 14:00:35 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -399,6 +399,7 @@ static var_entry var_table[] = { { "message_body", vtype_msgbody, &message_body }, { "message_body_end", vtype_msgbody_end, &message_body_end }, { "message_body_size", vtype_int, &message_body_size }, + { "message_exim_id", vtype_stringptr, &message_id }, { "message_headers", vtype_msgheaders, NULL }, { "message_id", vtype_stringptr, &message_id }, { "message_linecount", vtype_int, &message_linecount }, diff --git a/src/src/globals.c b/src/src/globals.c index 1f57ff383..ff27aee71 100644 --- a/src/src/globals.c +++ b/src/src/globals.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/globals.c,v 1.30 2005/06/21 14:14:55 ph10 Exp $ */ +/* $Cambridge: exim/src/src/globals.c,v 1.31 2005/08/01 14:00:35 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -821,7 +821,7 @@ uschar *received_header_text = US "${if def:tls_cipher {($tls_cipher)\n\t}}" #endif "(Exim $version_number)\n\t" - "id $message_id" + "id $message_exim_id" "${if def:received_for {\n\tfor $received_for}}" "\0<---------------Space to patch received_header_text->"; |