Tony's $received_time addition.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b8d68c4622381eccea2656688105cc709ada93c0..a732ae6ef5e77797a38473026c5c138ef4fe9e0f 100644 (file)
--- 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
 -------------------------------------------
 
 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.)
 
       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
 ----------------------------------------
 
 A note about Exim versions 4.44 and 4.50
 ----------------------------------------

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index e6e55c7457d9b672b0955a9680b11ec221ee5786..053bdabab7db40bb3e2e14da756edaac67d23f50 100644 (file)
--- 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
 --------------------
 
 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.
 
       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
 ------------
 
 Version 4.50
 ------------

diff --git a/src/src/expand.c b/src/src/expand.c
index d27530bd7b16059ce9beb9bc4e313b02792c55c5..fda06c61d57b3df4f4339aecdec819566f2e29a6 100644 (file)
--- 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    *
 
 /*************************************************
 *     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_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 },
   { "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());
         {
         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;
         }
 
         goto EXPAND_FAILED;
         }