diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-03-22 16:52:06 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2005-03-22 16:52:06 +0000 |
| commit | 7dbf77c91c1031bbefff89e89da710dde152ac98 (patch) | |
| tree | 96dbc734776e047b01b17f8180f20efc96fb3d79 | |
| parent | 7999bbd7269ec4bff21199b94e900e196e55977f (diff) | |
Tony's $received_time addition.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/doc-txt/NewStuff | 5 | ||||
| -rw-r--r-- | src/src/expand.c | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index b8d68c462..a732ae6ef 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.98 2005/03/22 16:44:04 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.99 2005/03/22 16:52:06 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -75,6 +75,8 @@ PH/13 If "headers_add" in a transport didn't end in a newline, Exim printed the result incorrectly in the debug output. (It correctly added a newline to what was transported.) +TF/01 Added $received_time. + A note about Exim versions 4.44 and 4.50 ---------------------------------------- diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff index e6e55c745..053bdabab 100644 --- a/doc/doc-txt/NewStuff +++ b/doc/doc-txt/NewStuff @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/NewStuff,v 1.29 2005/03/22 15:02:34 ph10 Exp $ +$Cambridge: exim/doc/doc-txt/NewStuff,v 1.30 2005/03/22 16:52:06 ph10 Exp $ New Features in Exim -------------------- @@ -87,6 +87,9 @@ PH/02 A new expansion item for dynamically loading and calling a locally- you need to add -shared to the gcc command. Also, in the Exim build-time configuration, you must add -export-dynamic to EXTRALIBS. +TF/01 $received_time is a new expansion variable containing the time and date + as a number of seconds since the start of the Unix epoch when the + current message was received. Version 4.50 ------------ diff --git a/src/src/expand.c b/src/src/expand.c index d27530bd7..fda06c61d 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/expand.c,v 1.17 2005/03/22 14:11:54 ph10 Exp $ */ +/* $Cambridge: exim/src/src/expand.c,v 1.18 2005/03/22 16:52:06 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -439,6 +439,7 @@ static var_entry var_table[] = { { "received_count", vtype_int, &received_count }, { "received_for", vtype_stringptr, &received_for }, { "received_protocol", vtype_stringptr, &received_protocol }, + { "received_time", vtype_int, &received_time }, { "recipient_data", vtype_stringptr, &recipient_data }, { "recipient_verify_failure",vtype_stringptr,&recipient_verify_failure }, { "recipients", vtype_recipients, NULL }, @@ -3920,7 +3921,7 @@ while (*s != 0) { expand_string_message = string_sprintf("dlsym \"%s\" in \"%s\" failed: " "%s", argv[1], argv[0], dlerror()); - log_write(0, LOG_MAIN|LOG_PANIC, "%s", expand_string_message); + log_write(0, LOG_MAIN|LOG_PANIC, "%s", expand_string_message); goto EXPAND_FAILED; } |