ph10 2006/02/28 14:54:54 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src expand.c
Log:
${prvs was broken on systems where time_t is long long.
Revision Changes Path
1.316 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.55 +2 -2 exim/exim-src/src/expand.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- ChangeLog 28 Feb 2006 12:42:47 -0000 1.315
+++ ChangeLog 28 Feb 2006 14:54:54 -0000 1.316
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.315 2006/02/28 12:42:47 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.316 2006/02/28 14:54:54 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -240,6 +240,8 @@
References: header, in accordance with RFCs 2822 and 3834.
PH/47 Added authenticated_sender_force to the smtp transport.
+
+PH/48 The ${prvs expansion was broken on systems where time_t was long long.
Exim version 4.60
Index: expand.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/expand.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- expand.c 10 Feb 2006 14:25:43 -0000 1.54
+++ expand.c 28 Feb 2006 14:54:54 -0000 1.55
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/expand.c,v 1.54 2006/02/10 14:25:43 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/expand.c,v 1.55 2006/02/28 14:54:54 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -2566,8 +2566,8 @@
static uschar *
prvs_daystamp(int day_offset)
{
-uschar *days = store_get(16);
-(void)string_format(days, 16, TIME_T_FMT,
+uschar *days = store_get(32); /* Need at least 24 for cases */
+(void)string_format(days, 32, TIME_T_FMT, /* where TIME_T_FMT is %lld */
(time(NULL) + day_offset*86400)/86400);
return (Ustrlen(days) >= 3) ? &days[Ustrlen(days)-3] : US"100";
}
