diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-12-11 14:15:59 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-12-11 14:15:59 +0000 |
| commit | e4fa6968044a1bd202877d7822209735c06e77da (patch) | |
| tree | 89594a2ad68badce7f203839801b5d42cc1d8301 | |
| parent | 79b5812be1007a9ece8ddcfb375f9e18eb6f8a4e (diff) | |
Buglet in error handling for expansion of helo_data in callouts.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 5 | ||||
| -rw-r--r-- | src/src/verify.c | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 72fdad599..b6d585584 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -1,4 +1,4 @@ -$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.442 2006/12/06 09:46:03 magnus Exp $ +$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.443 2006/12/11 14:15:59 ph10 Exp $ Change log file for Exim from version 4.21 ------------------------------------------- @@ -345,6 +345,9 @@ MH/01 local_scan ABI version incremented to 1.1. It should have been updated the "1.1" means that there are some new functions that weren't there at some point in the past. +PH/51 Error processing for expansion failure of helo_data from an smtp + transport during callout processing was broken. + Exim version 4.63 ----------------- diff --git a/src/src/verify.c b/src/src/verify.c index 5b635989e..9ec8d2bce 100644 --- a/src/src/verify.c +++ b/src/src/verify.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/verify.c,v 1.43 2006/10/10 15:36:50 ph10 Exp $ */ +/* $Cambridge: exim/src/src/verify.c,v 1.44 2006/12/11 14:15:59 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -441,9 +441,10 @@ for (host = host_list; host != NULL && !done; host = host->next) if (tf->helo_data != NULL) { uschar *s = expand_string(tf->helo_data); - if (active_hostname == NULL) + if (s == NULL) log_write(0, LOG_MAIN|LOG_PANIC, "<%s>: failed to expand transport's " - "helo_data value for callout: %s", expand_string_message); + "helo_data value for callout: %s", addr->address, + expand_string_message); else active_hostname = s; } |