Fix logging with build-time config and empty elements (Closes 2733)

[exim.git] / test / rejectlog / 0026

diff --git a/test/rejectlog/0026 b/test/rejectlog/0026
index 96682c4f36890ffb78e2bc13dfb984f360410e14..0499db2f61b6e554b428e074180d4ffa0a70f420 100644 (file)
--- a/test/rejectlog/0026
+++ b/test/rejectlog/0026
@@ -1,7 +1,8 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 U=CALLER F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <x@y>
 Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        for x@y;
@@ -12,7 +13,8 @@ I Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 1999-03-02 09:44:33 10HmaY-0005vi-00 U=CALLER F=<x@y> rejected after DATA: '>' missing at end of address: failing address in "To:" header is: <dummy@gmail.com
 Envelope-from: <x@y>
 Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaY-0005vi-00
        for x@y;
@@ -25,7 +27,8 @@ I Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 1999-03-02 09:44:33 10HmaZ-0005vi-00 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 Envelope-from: <>
 Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmaZ-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000
@@ -35,7 +38,8 @@ I Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
 1999-03-02 09:44:33 10HmbA-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmbA-0005vi-00
        for x@y;
        Tue, 2 Mar 1999 09:44:33 +0000
@@ -46,7 +50,8 @@ I Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
 1999-03-02 09:44:33 10HmbB-0005vi-00 U=CALLER F=<x@y> rejected after DATA: body contains trigger
 Envelope-from: <x@y>
 Envelope-to: <x@y>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmbB-0005vi-00
        for x@y;
@@ -57,7 +62,8 @@ F From: x@y
 1999-03-02 09:44:33 10HmbC-0005vi-00 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 Envelope-from: <>
 Envelope-to: <userx@test.ex>
-P Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+P Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)
        id 10HmbC-0005vi-00
        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000