X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/1eccaa59eb366c180c36af219a142d8f934f73b0..184e88237dea64ce48076cdd0184612d057cbafd:/src/src/verify.c

diff --git a/src/src/verify.c b/src/src/verify.c
index 5b635989e..141446aa7 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -1,10 +1,10 @@
-/* $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.45 2007/01/08 10:50:18 ph10 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 *************************************************/
 
-/* Copyright (c) University of Cambridge 1995 - 2006 */
+/* Copyright (c) University of Cambridge 1995 - 2007 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 /* Functions concerned with verifying things. The original code for callout
@@ -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;
     }