Address qualification: ensure maformed addresses are logged. Bug 3061

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 49d81084d25007e77988782c52c6681fd5b92035..21c84e09110f3b1bfc56b231f3539e2408f353ff 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -72,6 +72,9 @@ JH/14 Bug 3061: Avoid a split log line when trtying to rewrite a malformed
       there is only one) the terminating newline was part of the logged
       information.
 
+JH/15 Bug 3061: Ensure a log line is written for a malformed address in a
+      header, when parsing for address-qualification.  Previously one was only
+      written if there were rewrite rules.
 
 
 Exim version 4.97

diff --git a/src/src/rewrite.c b/src/src/rewrite.c
index 318cda215d5494630575cf98a393f9206c109484..70bd79e262aa38589f5032957ef8703fb10a3501 100644 (file)
--- a/src/src/rewrite.c
+++ b/src/src/rewrite.c
@@ -510,8 +510,8 @@ while (*s)
     address, "To: undisclosed recpients:;" being the classic case. Ignore
     this one and carry on. */
 
-    if ((rewrite_rules || routed_old) && Ustrcmp(errmess, "empty address") != 0)
-      log_write(0, LOG_MAIN, "rewrite: %s", errmess);
+    if (Ustrcmp(errmess, "empty address") != 0)
+      log_write(0, LOG_MAIN, "qualify/rewrite: %s", errmess);
 
     loop_reset_point = store_reset(loop_reset_point);
     continue;

diff --git a/test/log/0026 b/test/log/0026
index a537c7a25df8235905f22e598f7bddf335786c6b..5974b7ced35f6662dfdbebe431e307f7ebebc057 100644 (file)
--- a/test/log/0026
+++ b/test/log/0026
@@ -1,9 +1,13 @@
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 $h_from: 'x@y'
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 <= x@y U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 qualify/rewrite: domain missing or malformed
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 $h_from: '@'
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<x@y> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 qualify/rewrite: '>' missing at end of address
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 qualify/rewrite: '>' missing at end of address
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 $h_from: '<forged@sender.com'
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<x@y> rejected after DATA: '>' missing at end of address: failing address in "To:" header is: <dummy@gmail.com
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 qualify/rewrite: domain missing or malformed
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 $h_from: '<x@y>, @'
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "From:" header is: @
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 $h_from: '<x@y>'

diff --git a/test/log/0072 b/test/log/0072
index 0730df7289f3098de0e256f27205c6ff1505cdfd..89789a45947a1ea8d3a7a93ea4a03ddb8f02892e 100644 (file)
--- a/test/log/0072
+++ b/test/log/0072
@@ -31,6 +31,7 @@
 1999-03-02 09:44:33 10HmbH-000000005vi-0000 Completed
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 => userx <userx@test.ex> R=reply T=reply
 1999-03-02 09:44:33 10HmbG-000000005vi-0000 Completed
+1999-03-02 09:44:33 10HmbI-000000005vi-0000 qualify/rewrite: missing or malformed local part (expected word or "<")
 1999-03-02 09:44:33 10HmbI-000000005vi-0000 <= CALLER@test.ex U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmbI-000000005vi-0000 ** >**bad-reply** <userx-filter@test.ex> R=filter: filter autoreply generated syntactically invalid recipient
 1999-03-02 09:44:33 10HmbI-000000005vi-0000 >**bad-reply** <userx-filter@test.ex>: error ignored

diff --git a/test/log/0162 b/test/log/0162
index f463f6931559b52c6a69c130b383ca2c0cf7aec4..3ea2941cc5bb0bc5bd40b10169ba3877985a05c2 100644 (file)
--- a/test/log/0162
+++ b/test/log/0162
@@ -1 +1,4 @@
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 qualify/rewrite: malformed address: ">,
+  <u213@shrike.depaul.edu>,
+ may not follow <u212@shrike.depaul.edu
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<CALLER@myhost.test.ex> rejected after DATA: malformed address: ">,\n  <u213@shrike.depaul.edu>,\n may not follow <u212@shrike.depaul.edu: failing address in "To:" header begins: <u212@shrike.depaul.edu">,\n  <u213@shrike.depaul.edu>,\n  <u214@hotmail.com>,\n  <u215@hotmail.com>,\n  <u216@hotmail.com>,\n  <u217@hotmail.com>,\n  <u218@hotmail.com>,\n  <u219@angelfire.com>,\n  <u220@chickmail.com>,\n  <u221@excite.com>,\n  <u222@chickmail.com>,\n  <u223@eudoramail.com>,\n  <u224@alleyne.demon.co.uk>,\n  <u225@dial.pipex.com>,\n  <u226@hotmail.com>,\n  <u227@gpu.srv.ualberta.ca>,\n  <u228@ulst.ac.uk>,\n  <u229@worldnet.att.net>,\n  <u230@hotmail.com>,\n  <u231@careerbuildermail.com>,\n  <u232@MSN.COM>,\n  <u233@angelfire.com>,\n  <u234@hotmail.com>,\n  <u235@hotmail.com>,\n  <u236@compuserve.com>,\n  <u237@compuserve.com>,\n  <u238@hotmail.com>,\n  <u239@bellsouth.net>,\n  <u240@n64rocks.com>,\n  <u241@mailexcite.com>,\n  <u242@mailexcite.com>,\n  <u243@mailcity.com>,\n  <u244@bigfoot.com>,\n  <u245@sunbeach.net>,\n  <u246@mailcity.com>,\n  <u247@pacbell.net>,\n  <u248@hotmail.com>,\n  <u249@worldnet.att.net>,\n  <u250@bigfoot.com>,\n  <u251@mailexcite.com>,\n  <u252@netnoir.net>,\n  <u253@cablecomm1.pcs.mot.com>,\n  <u254@compu

diff --git a/test/log/0214 b/test/log/0214
index d85d721dd9f127ce4b80007d1a386512e1d41731..85d0be872a46aeca2a2614f82f72eaeac68f0ee7 100644 (file)
--- a/test/log/0214
+++ b/test/log/0214
@@ -1,4 +1,5 @@
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 qualify/rewrite: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 H=(test) [127.0.0.1] F=<x@y.x> rejected after DATA: malformed address: ;bad@address;bad@address;bad@add may not follow bad@address: failing address in "To:" header begins: bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address;bad@address;bad@address;bad@address;bad@address;\n    bad@address;bad@address

diff --git a/test/log/0365 b/test/log/0365
index a484a8b17b00456e5fa7f140b84f69d52aa3fedc..55ae1c787c640536508e9ceab0e80d26540189b6 100644 (file)
--- a/test/log/0365
+++ b/test/log/0365
@@ -1,19 +1,23 @@
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 qualify/rewrite: '>' missing at end of address
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Network Error
 1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
 1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
+1999-03-02 09:44:33 10HmaZ-000000005vi-0000 qualify/rewrite: '>' missing at end of address
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 U=CALLER F=<nosyntax@x> rejected after DATA
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 1999-03-02 09:44:33 sender verify defer (making calloout connection): T=smtp Network Error
 1999-03-02 09:44:33 U=CALLER F=<recipcallout@y> temporarily rejected RCPT <callout@y>: Could not complete recipient verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
 1999-03-02 09:44:33 U=CALLER F=<> rejected RCPT <cantverify.fail@y>: failure message
 1999-03-02 09:44:33 U=CALLER F=<> temporarily rejected RCPT <cantverify.defer@y>: defer message
+1999-03-02 09:44:33 10HmbB-000000005vi-0000 qualify/rewrite: '>' missing at end of address
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 U=CALLER F=<> rejected after DATA: '>' missing at end of address: failing address in "From:" header is: <bad@syntax
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 1999-03-02 09:44:33 recipient verify defer (making calloout connection): T=smtp Network Error
 1999-03-02 09:44:33 U=CALLER sender verify defer for <callout@x>: Could not complete sender verify callout: V4NET.0.0.0 [V4NET.0.0.0] : Network Error
 1999-03-02 09:44:33 U=CALLER F=<callout@x> temporarily rejected RCPT <x@y>: Could not complete sender verify callout
+1999-03-02 09:44:33 10HmbD-000000005vi-0000 qualify/rewrite: '>' missing at end of address
 1999-03-02 09:44:33 10HmbD-000000005vi-0000 U=CALLER F=<nosyntax@x> rejected after DATA
 1999-03-02 09:44:33 10HmbE-000000005vi-0000 U=CALLER F=<> rejected after DATA: there is no valid sender in any header line
 1999-03-02 09:44:33 sender verify defer (making calloout connection): T=smtp Network Error

diff --git a/test/log/0465 b/test/log/0465
index c8bc1458d059acc2a1cebf0330e4ee7390730cae..6b7628c32d41afffb90d00664f07264b439237aa 100644 (file)
--- a/test/log/0465
+++ b/test/log/0465
@@ -1,3 +1,4 @@
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= <> U=CALLER P=local-smtp S=sss
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= abc@somewhere U=CALLER P=local S=sss
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 qualify/rewrite: domain missing or malformed
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER F=<> rejected after DATA: domain missing or malformed: failing address in "To:" header is: abc@xyz.

diff --git a/test/log/0471 b/test/log/0471
index c80286d970ffaab93f8807872586f41e07b0dec4..4d963cb5505f208d7b36c5e289aae5f3781515fd 100644 (file)
--- a/test/log/0471
+++ b/test/log/0471
@@ -1,10 +1,10 @@
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for r1@test.ex
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for r2@test.ex
 1999-03-02 09:44:33 10HmaZ-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for r3@test.ex
-1999-03-02 09:44:33 10HmbA-000000005vi-0000 rewrite: address is ridiculously long: localpart_with_256_chars_567890123456789012345678901234567890123...
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 qualify/rewrite: address is ridiculously long: localpart_with_256_chars_567890123456789012345678901234567890123...
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 verify header_syntax fails
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for r4@test.ex
 1999-03-02 09:44:33 10HmbB-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for r5@test.ex
-1999-03-02 09:44:33 10HmbC-000000005vi-0000 rewrite: domain missing or malformed
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 qualify/rewrite: domain missing or malformed
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 verify header_syntax fails
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for r6@test.ex

diff --git a/test/log/0560 b/test/log/0560
index 9be1ae0cf66e52739f700213935485981c1facb0..f7d8b8993e9d46ac0be77f4f2a8f023518fa684f 100644 (file)
--- a/test/log/0560
+++ b/test/log/0560
@@ -1 +1,3 @@
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 qualify/rewrite: malformed address: another@another.ex may not follow first@test.ex
+    
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local S=sss

diff --git a/test/log/4004 b/test/log/4004
index 82e195fb924dcdb36bd0f59d3a613553036e59db..5a04f629001f62886529770249dd485805ac8982 100644 (file)
--- a/test/log/4004
+++ b/test/log/4004
@@ -1,3 +1,4 @@
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 qualify/rewrite: missing or malformed local part
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 U=CALLER Warning: reject Action: reject\n Symbol: FAKE_SYMBOL_A(15.00)\n Symbol: FAKE_SYMBOL_B(0.00)\n Message-ID: undef
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 => :blackhole: <userx@test.ex> R=r

diff --git a/test/log/4207 b/test/log/4207
index f3cc864c5cba46605c732f9c280249678a208abd..24521c670d9250412de9b5e47f501750c180325a 100644 (file)
--- a/test/log/4207
+++ b/test/log/4207
@@ -10,8 +10,11 @@
 
 ******** SERVER ********
 1999-03-02 09:44:33 exim x.yz daemon started: pid=p1234, no queue runs, listening for SMTP on port PORT_D
+1999-03-02 09:44:33 10HmaY-000000005vi-0000 qualify/rewrite: domain missing or malformed
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 <= xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaX-000000005vi-0000@the.local.host.name for xn--user1.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex
+1999-03-02 09:44:33 10HmbA-000000005vi-0000 qualify/rewrite: domain missing or malformed
 1999-03-02 09:44:33 10HmbA-000000005vi-0000 <= xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmaZ-000000005vi-0000@the.local.host.name for xn--user2.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex
+1999-03-02 09:44:33 10HmbC-000000005vi-0000 qualify/rewrite: domain missing or malformed
 1999-03-02 09:44:33 10HmbC-000000005vi-0000 <= xn--ihqwcrb4cv8a8dqg056pqjye@hebrew.xn--4dbcagdahymbxekheh6e0a7fei0b.com H=localhost (the.local.host.name) [127.0.0.1] P=esmtp S=sss id=E10HmbB-000000005vi-0000@the.local.host.name for xn--user3.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex
 1999-03-02 09:44:33 Start queue run: pid=p1235 -qqff
 1999-03-02 09:44:33 10HmaY-000000005vi-0000 => :blackhole: <xn--user1.-g95ww2bm7c8xj18gesgrby74dwqh18as2ft0ab05f5nc9w1befas47alnaxwd256esy4hea33e@test.ex> R=localuser

diff --git a/test/log/5701 b/test/log/5701
index 531dc63f734aa2618fac349e537d36071f17123a..657f2f8070bb205ec942938a3eccdfb884d886f1 100644 (file)
--- a/test/log/5701
+++ b/test/log/5701
@@ -1,3 +1,4 @@
+1999-03-02 09:44:33 10HmaX-000000005vi-0000 qualify/rewrite: missing or malformed local part (expected word or "<")
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 <= CALLER@the.local.host.name U=CALLER P=local S=sss
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 ** >**bad-reply** <userx-filter@domain1> R=router_filter T=reply: filter autoreply generated syntactically invalid recipient
 1999-03-02 09:44:33 10HmaX-000000005vi-0000 event msg:fail:delivery

diff --git a/test/stderr/0026 b/test/stderr/0026
index 5ab7d4da7a50c7a7c290d2492163fc450770d1f4..8fdd0ef0156f2809368ff86c565ab4ea89dcd6f1 100644 (file)
--- a/test/stderr/0026
+++ b/test/stderr/0026
@@ -14,6 +14,7 @@
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
+LOG: 10HmbI-000000005vi-0000 qualify/rewrite: domain missing or malformed
 >>> using ACL "acl_data"
 >>> processing "deny" (TESTSUITE/test-config 21)
 >>> l_message: body contains trigger

diff --git a/test/stderr/0086 b/test/stderr/0086
index ad5234ec9e6f98dea7efac529d35cce1f3198a71..0ff15c6aaa73d2cc6473543753816e1dae36e5f5 100644 (file)
--- a/test/stderr/0086
+++ b/test/stderr/0086
@@ -16,6 +16,7 @@
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
+LOG: 10HmaY-000000005vi-0000 qualify/rewrite: '>' missing at end of address
 >>> using ACL "check_message"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>> check !verify = header_syntax
@@ -43,6 +44,8 @@ LOG: 10HmaY-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> re
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
+LOG: 10HmaZ-000000005vi-0000 qualify/rewrite: '>' missing at end of address
+LOG: 10HmaZ-000000005vi-0000 qualify/rewrite: '>' missing at end of address
 >>> using ACL "check_message"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>> check !verify = header_syntax
@@ -70,6 +73,7 @@ LOG: 10HmaZ-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> re
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
+LOG: 10HmbA-000000005vi-0000 qualify/rewrite: '>' missing at end of address
 >>> using ACL "check_message"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>> check !verify = header_syntax
@@ -97,6 +101,7 @@ LOG: 10HmbA-000000005vi-0000 H=(test) [V4NET.10.10.10] F=<userx@exim.test.ex> re
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
+LOG: 10HmbB-000000005vi-0000 qualify/rewrite: unmatched doublequote in local part
 >>> using ACL "check_message"
 >>> processing "deny" (TESTSUITE/test-config 19)
 >>> check !verify = header_syntax

diff --git a/test/stderr/0087 b/test/stderr/0087
index 1226a7dfd7964e9ada4599a38306e50c64d33b5d..29ea14896574b83921652f5eefb7d4fc2dee5d46 100644 (file)
--- a/test/stderr/0087
+++ b/test/stderr/0087
@@ -96,6 +96,7 @@ LOG: 10HmaX-000000005vi-0000 <= userx@test.ex H=(test) [V4NET.10.10.10] P=smtp S
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
+LOG: 10HmaY-000000005vi-0000 qualify/rewrite: '>' missing at end of address
 >>> using ACL "check_message"
 >>> processing "require" (TESTSUITE/test-config 26)
 >>> check verify = header_sender

diff --git a/test/stderr/0121 b/test/stderr/0121
index 8e6e33d1c7e81e0557967af689c227768f51cb68..283bb7111b8e7afac4bfb32e02eb0cff5844a595 100644 (file)
--- a/test/stderr/0121
+++ b/test/stderr/0121
@@ -163,6 +163,7 @@ LOG: 10HmaX-000000005vi-0000 H=(test) [127.0.0.1] F=<userx@test.ex> rejected aft
 >>> accept: condition test succeeded in ACL "check_recipient"
 >>> end of ACL "check_recipient": ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
+LOG: 10HmaY-000000005vi-0000 qualify/rewrite: missing or malformed local part
 >>> using ACL "check_message"
 >>> processing "require" (TESTSUITE/test-config 27)
 >>> check verify = header_sender

diff --git a/test/stderr/0249 b/test/stderr/0249
index fd603f069cf8d0146f1c386bbab074c58b0f3a86..ff905a491adb785cb1013af9941b56eb5778b2ae 100644 (file)
--- a/test/stderr/0249
+++ b/test/stderr/0249
@@ -76,5 +76,5 @@ LOG: address_rewrite MAIN
 >>>   list element: c.domain
 >>>  some.domain in "c.domain"? no (end of list)
 >>> someone@some.domain in "*@c.domain"? no (end of list)
-LOG: 10HmaX-000000005vi-0000 rewrite: malformed address: @c may not follow a@b
+LOG: 10HmaX-000000005vi-0000 qualify/rewrite: malformed address: @c may not follow a@b
 LOG: 10HmaX-000000005vi-0000 <= a@b H=(tester) [127.0.0.1] P=smtp S=sss

diff --git a/test/stderr/0465 b/test/stderr/0465
index 76820b09df8c5511d39b131d1382827c2ecfaa06..5bcd5a1ceafe41c69e9355b88a1a081b4def7525 100644 (file)
--- a/test/stderr/0465
+++ b/test/stderr/0465
@@ -147,6 +147,8 @@ rewrite rules on sender address
 qualify and rewrite headers
  rewrite_one_header: type=T:
    To: abc@xyz.
+LOG: MAIN
+  qualify/rewrite: domain missing or malformed
 search_tidyup called
 >>Headers after rewriting and local additions:
  T To: abc@xyz.

diff --git a/test/stderr/0471 b/test/stderr/0471
index c1b27e63cc14fcf44ae343f9fc0d53b705b20aad..a0950c7a376439f0288fe4c8541a8f5710a4f922 100644 (file)
--- a/test/stderr/0471
+++ b/test/stderr/0471
@@ -27373,7 +27373,7 @@ qualify and rewrite headers
  rewrite_one_header: type=T:
    To: localpart_with_256_chars_5678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example
 LOG: MAIN
-  rewrite: address is ridiculously long: localpart_with_256_chars_567890123456789012345678901234567890123...
+  qualify/rewrite: address is ridiculously long: localpart_with_256_chars_567890123456789012345678901234567890123...
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@myhost.test.ex>
  CALLER@myhost.test.ex in "^.{40,}@*"?
@@ -27704,7 +27704,7 @@ qualify and rewrite headers
  rewrite_one_header: type=T:
    To: fred@
 LOG: MAIN
-  rewrite: domain missing or malformed
+  qualify/rewrite: domain missing or malformed
  rewrite_one_header: type=F:
    From: CALLER_NAME <CALLER@myhost.test.ex>
  CALLER@myhost.test.ex in "^.{40,}@*"?

diff --git a/test/stderr/0569 b/test/stderr/0569
index 706e61db5762b77ff7ea214ed2d71979231371ac..8c41999d9a05c82ee82fc20b0f4723f6cbb69a7a 100644 (file)
--- a/test/stderr/0569
+++ b/test/stderr/0569
@@ -26,6 +26,7 @@
 >>> accept: condition test succeeded in inline ACL
 >>> end of inline ACL: ACCEPT
 >>> host in ignore_fromline_hosts? no (option unset)
+LOG: 10HmaX-000000005vi-0000 qualify/rewrite: '>' missing at end of address
 >>> using ACL "check_message"
 >>> processing "require" (TESTSUITE/test-config 25)
 >>>   message: ${if def:acl_m_message {$acl_m_message}}