diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-02-28 14:54:54 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-02-28 14:54:54 +0000 |
| commit | a86229cf39b952455a30a720778838d18ef49fff (patch) | |
| tree | 036de51f50c9e9fece43990d40465fa12a04858c | |
| parent | 382afc6ba69545d52398da6b437e487aa23f185d (diff) | |
${prvs was broken on systems where time_t is long long.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 4 | ||||
| -rw-r--r-- | src/src/expand.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index c508ee545..8773e24f4 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.315 2006/02/28 12:42:47 ph10 Exp $ +$Cambridge: 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 ------------------------------------------- @@ -241,6 +241,8 @@ PH/46 Messages that are created by the autoreply transport now contains a 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 ----------------- diff --git a/src/src/expand.c b/src/src/expand.c index 1d82a150c..c4932d58d 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/expand.c,v 1.54 2006/02/10 14:25:43 ph10 Exp $ */ +/* $Cambridge: 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 @@ Returns: pointer to string containing the last three 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"; } |