[exim-cvs] cvs commit: exim/exim-src/src verify.c exim/exim…

Top Page
Delete this message
Reply to this message
Author: Philip Hazel
Date:  
To: exim-cvs
Subject: [exim-cvs] cvs commit: exim/exim-src/src verify.c exim/exim-doc/doc-txt ChangeLog
ph10 2006/12/11 14:15:59 GMT

  Modified files:
    exim-src/src         verify.c 
    exim-doc/doc-txt     ChangeLog 
  Log:
  Buglet in error handling for expansion of helo_data in callouts.


  Revision  Changes    Path
  1.443     +3 -0      exim/exim-doc/doc-txt/ChangeLog
  1.44      +3 -2      exim/exim-src/src/verify.c


  Index: verify.c
  ===================================================================
  RCS file: /home/cvs/exim/exim-src/src/verify.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- verify.c    10 Oct 2006 15:36:50 -0000    1.43
  +++ verify.c    11 Dec 2006 14:15:59 -0000    1.44
  @@ -1,4 +1,4 @@
  -/* $Cambridge: exim/exim-src/src/verify.c,v 1.43 2006/10/10 15:36:50 ph10 Exp $ */
  +/* $Cambridge: exim/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 @@
     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;
       }



  Index: ChangeLog
  ===================================================================
  RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
  retrieving revision 1.442
  retrieving revision 1.443
  diff -u -r1.442 -r1.443
  --- ChangeLog    6 Dec 2006 09:46:03 -0000    1.442
  +++ ChangeLog    11 Dec 2006 14:15:59 -0000    1.443
  @@ -1,4 +1,4 @@
  -$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.442 2006/12/06 09:46:03 magnus Exp $
  +$Cambridge: exim/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
   -------------------------------------------
  @@ -344,6 +344,9 @@
         long ago, but noone interested enough thought of it. Let's just say that
         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