Don't set $sender_host_name if forward lookup of name obtained from

reverse lookup times out.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 629762d4c69f085a13816ad928a16f8e83500058..2629276fe68c836f7042c57cc89b681aae10202a 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.438 2006/11/20 13:53:44 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.439 2006/11/20 14:29:31 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -330,7 +330,9 @@ PH/47 Put in an explicit test for a DNS lookup of an address record where the
       those revolvers/nameservers that support "A-for-A" lookups, in
       contravention of the specifications.
 
       those revolvers/nameservers that support "A-for-A" lookups, in
       contravention of the specifications.
 

-
+PH/48 When a host name was looked up from an IP address, and the subsequent
+      forward lookup of the name timed out, the host name was left in
+      $sender_host_name, contrary to the specification.

 
 
 Exim version 4.63
 
 
 Exim version 4.63

diff --git a/src/src/host.c b/src/src/host.c
index 039f58fb219576862ae7f7602d06c8bb4bdc70c5..24c4bec791a1a36cc4cc7b527af859bebcd3fa7b 100644 (file)
--- a/src/src/host.c
+++ b/src/src/host.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/host.c,v 1.26 2006/10/09 14:36:25 ph10 Exp $ */
+/* $Cambridge: exim/src/src/host.c,v 1.27 2006/11/20 14:29:31 ph10 Exp $ */

 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *


@@ -1792,6 +1792,7 @@ for (hname = sender_host_name; hname != NULL; hname = *aliases++)
     {
     HDEBUG(D_host_lookup) debug_printf("temporary error for host name lookup\n");
     host_lookup_deferred = TRUE;
     {
     HDEBUG(D_host_lookup) debug_printf("temporary error for host name lookup\n");
     host_lookup_deferred = TRUE;

+    sender_host_name = NULL;

     return DEFER;
     }
   else
     return DEFER;
     }
   else

diff --git a/test/log/0094 b/test/log/0094
index 17b388fb1cded3a060fb8f3d70fd3a88e61b87c2..9325a3459d25d41cef9661307d845ebe15e82579 100644 (file)
--- a/test/log/0094
+++ b/test/log/0094
@@ -5,6 +5,6 @@
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[99.99.99.99] U=root P=smtp S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=localuser T=appendfile
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= userx@test.ex H=[99.99.99.99] U=root P=smtp S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.ex> R=localuser T=appendfile
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

-1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@test.ex H=x.test.again.dns [V4NET.99.99.96] U=root P=smtp S=sss
+1999-03-02 09:44:33 10HmaZ-0005vi-00 <= userx@test.ex H=[V4NET.99.99.96] U=root P=smtp S=sss

 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=localuser T=appendfile
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx <userx@test.ex> R=localuser T=appendfile
 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed

diff --git a/test/mail/0094.userx b/test/mail/0094.userx
index bbc8b2ad8f4d39659092c8136ea8d428e6da5c29..255c120265a47a70612d7f43d2677af184dfb87f 100644 (file)
--- a/test/mail/0094.userx
+++ b/test/mail/0094.userx
@@ -21,7 +21,7 @@ host_lookup_deferred: 1
 This is a test message
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 This is a test message
 
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from x.test.again.dns ([V4NET.99.99.96] ident=root)
+Received: from [V4NET.99.99.96] (ident=root)

        by the.local.host.name with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaZ-0005vi-00
        by the.local.host.name with smtp (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaZ-0005vi-00