From 17648b558fc29a488d1e0bc12d2960f892d2838a Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 31 Dec 2023 19:59:09 +0000 Subject: [PATCH] Rewrites: avoid a split log line when rewiting hits a malformed address. Bug 3160 --- doc/doc-txt/ChangeLog | 5 +++ src/src/parse.c | 40 +++++++++-------- src/src/receive.c | 8 ++-- src/src/rewrite.c | 34 ++++++++------ test/confs/0249 | 2 + test/scripts/0000-Basic/0249 | 18 ++++++++ test/stderr/0022 | 12 ++--- test/stderr/0044 | 4 +- test/stderr/0249 | 60 +++++++++++++++++++++++++ test/stderr/0275 | 10 ++--- test/stderr/0278 | 10 ++--- test/stderr/0294 | 12 ++--- test/stderr/0303 | 8 ++-- test/stderr/0317 | 30 ++++++------- test/stderr/0361 | 10 ++--- test/stderr/0371 | 4 +- test/stderr/0386 | 8 ++-- test/stderr/0388 | 24 +++++----- test/stderr/0402 | 10 ++--- test/stderr/0403 | 20 ++++----- test/stderr/0404 | 36 +++++++-------- test/stderr/0408 | 10 ++--- test/stderr/0465 | 20 ++++----- test/stderr/0471 | 87 ++++++++++++++++++------------------ test/stderr/0487 | 10 ++--- test/stderr/0489 | 48 ++++++++++---------- test/stderr/0575 | 4 +- test/stderr/2600 | 10 ++--- test/stderr/2610 | 10 ++--- test/stderr/2620 | 10 ++--- test/stderr/5004 | 10 ++--- test/stderr/5005 | 40 ++++++++--------- test/stderr/5006 | 10 ++--- test/stdout/0249 | 15 +++++++ 34 files changed, 381 insertions(+), 268 deletions(-) diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index b72819fb4..49d81084d 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -67,6 +67,11 @@ JH/13 Add an fdatasync call for the received message data file in spool, before loggging reception and sending the SMTP ack. Previously we only flushed the stdio buffer so there was still the possibility of a disk error. +JH/14 Bug 3061: Avoid a split log line when trtying to rewrite a malformed + address. Previously, for the last address in a header line (commonly + there is only one) the terminating newline was part of the logged + information. + Exim version 4.97 diff --git a/src/src/parse.c b/src/src/parse.c index 29f98e1e2..ecdbe9f8d 100644 --- a/src/src/parse.c +++ b/src/src/parse.c @@ -69,30 +69,31 @@ Returns: pointer past the end of the address */ uschar * -parse_find_address_end(const uschar *s, BOOL nl_ends) +parse_find_address_end(const uschar * s, BOOL nl_ends) { BOOL source_routing = *s == '@'; -int no_term = source_routing? 1 : 0; +int no_term = source_routing ? 1 : 0; -while (*s != 0 && (*s != ',' || no_term > 0) && (*s != '\n' || !nl_ends)) +while (*s && (*s != ',' || no_term > 0) && (*s != '\n' || !nl_ends)) { /* Skip single quoted characters. Strictly these should not occur outside quoted strings in RFC 822 addresses, but they can in RFC 821 addresses. Pity about the lack of consistency, isn't it? */ - if (*s == '\\' && s[1] != 0) s += 2; + if (*s == '\\' && s[1]) + s += 2; /* Skip quoted items that are not inside brackets. Note that quoted pairs are allowed inside quoted strings. */ else if (*s == '\"') - { - while (*(++s) != 0 && (*s != '\n' || !nl_ends)) + while (*++s && (*s != '\n' || !nl_ends)) { - if (*s == '\\' && s[1] != 0) s++; - else if (*s == '\"') { s++; break; } + if (*s == '\\' && s[1]) + s++; + else if (*s == '\"') + { s++; break; } } - } /* Skip comments, which may include nested brackets, but quotes are not recognized inside comments, though quoted pairs are. */ @@ -100,12 +101,13 @@ while (*s != 0 && (*s != ',' || no_term > 0) && (*s != '\n' || !nl_ends)) else if (*s == '(') { int level = 1; - while (*(++s) != 0 && (*s != '\n' || !nl_ends)) - { - if (*s == '\\' && s[1] != 0) s++; - else if (*s == '(') level++; - else if (*s == ')' && --level <= 0) { s++; break; } - } + while (*++s && (*s != '\n' || !nl_ends)) + if (*s == '\\' && s[1]) + s++; + else if (*s == '(') + level++; + else if (*s == ')' && --level <= 0) + { s++; break; } } /* Non-special character; just advance. Passing the colon in a source @@ -117,10 +119,12 @@ while (*s != 0 && (*s != ',' || no_term > 0) && (*s != '\n' || !nl_ends)) if (*s == '<') { source_routing = s[1] == '@'; - no_term = source_routing? 2 : 1; + no_term = source_routing ? 2 : 1; } - else if (*s == '>') no_term--; - else if (source_routing && *s == ':') no_term--; + else if (*s == '>') + no_term--; + else if (source_routing && *s == ':') + no_term--; s++; } } diff --git a/src/src/receive.c b/src/src/receive.c index 63aded09f..ae4203e7f 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -3069,7 +3069,7 @@ if ( from_header it has already been rewritten as part of verification for SMTP input. */ DEBUG(D_rewrite) - { debug_printf("global rewrite rules\n"); acl_level++; } + { debug_printf("rewrite rules on sender address\n"); acl_level++; } if (global_rewrite_rules && !sender_address_unrewritten && *sender_address) { /* deconst ok as src was not const */ @@ -3096,7 +3096,7 @@ documented as happening *after* recipient addresses are taken from the headers by the -t command line option. An added Sender: gets rewritten here. */ DEBUG(D_rewrite) - { debug_printf("rewrite headers\n"); acl_level++; } + { debug_printf("qualify and rewrite headers\n"); acl_level++; } for (header_line * h = header_list->next, * newh; h; h = h->next) if ((newh = rewrite_header(h, NULL, NULL, global_rewrite_rules, rewrite_existflags, TRUE))) @@ -3135,9 +3135,11 @@ new Received:) has not yet been set. */ DEBUG(D_receive) { debug_printf(">>Headers after rewriting and local additions:\n"); + acl_level++; for (header_line * h = header_list->next; h; h = h->next) - debug_printf("%c %s", h->type, h->text); + debug_printf_indent("%c %s", h->type, h->text); debug_printf("\n"); + acl_level--; } /* The headers are now complete in store. If we are running in filter diff --git a/src/src/rewrite.c b/src/src/rewrite.c index c0d173abf..318cda215 100644 --- a/src/src/rewrite.c +++ b/src/src/rewrite.c @@ -450,13 +450,13 @@ rewrite_one_header(header_line *h, int flag, rewrite_rule *rewrite_rules, int existflags, BOOL replace) { int lastnewline = 0; -header_line *newh = NULL; +header_line * newh = NULL; rmark function_reset_point = store_mark(); -uschar *s = Ustrchr(h->text, ':') + 1; +uschar * s = Ustrchr(h->text, ':') + 1; while (isspace(*s)) s++; -DEBUG(D_rewrite) +DEBUG(D_rewrite) /* The header text includes the trailing newline */ debug_printf_indent("rewrite_one_header: type=%c:\n %s", h->type, h->text); f.parse_allow_group = TRUE; /* Allow group syntax */ @@ -470,24 +470,31 @@ We want to avoid keeping store for any intermediate versions. */ while (*s) { - uschar *sprev; - uschar *ss = parse_find_address_end(s, FALSE); - uschar *recipient, *new; + uschar * sprev = s; + uschar * ss = parse_find_address_end(s, FALSE), * ss1 = ss; + uschar * recipient, * new; rmark loop_reset_point = store_mark(); - uschar *errmess = NULL; + uschar * errmess = NULL; BOOL changed = FALSE; - int terminator = *ss; + uschar terminator = *ss; int start, end, domain; + /* If we hit the end of the header, trim trailing newline and whitespace */ + + if (!terminator) + { + while (ss1 > s && isspace(ss1[-1])) ss1--; + terminator = *ss1; + } + /* Temporarily terminate the string at this point, and extract the operative address within. Then put back the terminator and prepare for the next address, saving the start of the old one. */ - *ss = 0; + *ss1 = '\0'; recipient = parse_extract_address(s, &errmess, &start, &end, &domain, FALSE); - *ss = terminator; - sprev = s; - s = ss + (terminator ? 1 : 0); + *ss1 = terminator; + s = ss + (*ss ? 1 : 0); while (isspace(*s)) s++; /* There isn't much we can do for syntactic disasters at this stage. @@ -587,7 +594,8 @@ while (*s) point, because we may have a rewritten line from a previous time round the loop. */ - if (!changed) loop_reset_point = store_reset(loop_reset_point); + if (!changed) + loop_reset_point = store_reset(loop_reset_point); /* If the address has changed, create a new header containing the rewritten address. We do not need to set the chain pointers at this diff --git a/test/confs/0249 b/test/confs/0249 index 1d7491be6..aecf90d81 100644 --- a/test/confs/0249 +++ b/test/confs/0249 @@ -6,6 +6,7 @@ primary_hostname = myhost.test.ex # ----- Main settings ----- +acl_smtp_rcpt = accept # ----- Rewrite ----- @@ -14,5 +15,6 @@ begin rewrite *@a.domain $1@b.domain *@c.domain $local_part@d.domain +a@b y@z T # End diff --git a/test/scripts/0000-Basic/0249 b/test/scripts/0000-Basic/0249 index 2394cd76b..9196060c6 100644 --- a/test/scripts/0000-Basic/0249 +++ b/test/scripts/0000-Basic/0249 @@ -3,3 +3,21 @@ exim -brw User@a.domain **** exim -d-all+rewrite -brw User@c.domain **** +# +# +# +# Check logging for a malformed address being rewritten +exim -bh 127.0.0.1 +HELO tester +MAIL FROM: +RCPT TO: +DATA +Subject: test +From: someone@some.domain +Date: Tue, 2 Mar 1999 09:44:33 +0000 +Reply-To: a@b@c + +body +. +QUIT +**** diff --git a/test/stderr/0022 b/test/stderr/0022 index 2eae4f906..ae03e7317 100644 --- a/test/stderr/0022 +++ b/test/stderr/0022 @@ -54,8 +54,8 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: @@ -137,8 +137,8 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: @@ -218,8 +218,8 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: diff --git a/test/stderr/0044 b/test/stderr/0044 index efb5dd810..90799b13a 100644 --- a/test/stderr/0044 +++ b/test/stderr/0044 @@ -147,8 +147,8 @@ host in ignore_fromline_hosts? no (option unset) >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: diff --git a/test/stderr/0249 b/test/stderr/0249 index b3281d30c..fd603f069 100644 --- a/test/stderr/0249 +++ b/test/stderr/0249 @@ -18,3 +18,63 @@ LOG: address_rewrite MAIN LOG: address_rewrite MAIN "User@c.domain" from env-to rewritten as "User@d.domain" by rule 2 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>> host in hosts_connection_nolog? no (option unset) +>>> host in host_lookup? no (option unset) +>>> host in host_reject_connection? no (option unset) +>>> host in sender_unqualified_hosts? no (option unset) +>>> host in recipient_unqualified_hosts? no (option unset) +>>> host in helo_verify_hosts? no (option unset) +>>> host in helo_try_verify_hosts? no (option unset) +>>> host in helo_accept_junk_hosts? no (option unset) +>>> tester in helo_lookup_domains? +>>> list element: @ +>>> list element: @[] +>>> tester in helo_lookup_domains? no (end of list) +>>> processing "accept" (TESTSUITE/test-config 20) +>>> accept: condition test succeeded in inline ACL +>>> end of inline ACL: ACCEPT +>>> host in ignore_fromline_hosts? no (option unset) +>>> a@text.ex in "*@a.domain"? +>>> list element: *@a.domain +>>> text.ex in "a.domain"? +>>> list element: a.domain +>>> text.ex in "a.domain"? no (end of list) +>>> a@text.ex in "*@a.domain"? no (end of list) +>>> a@text.ex in "*@c.domain"? +>>> list element: *@c.domain +>>> text.ex in "c.domain"? +>>> list element: c.domain +>>> text.ex in "c.domain"? no (end of list) +>>> a@text.ex in "*@c.domain"? no (end of list) +>>> a@text.ex in "a@b"? +>>> list element: a@b +>>> text.ex in "b"? +>>> list element: b +>>> text.ex in "b"? no (end of list) +>>> a@text.ex in "a@b"? no (end of list) +>>> a@b in "*@a.domain"? +>>> list element: *@a.domain +>>> b in "a.domain"? +>>> list element: a.domain +>>> b in "a.domain"? no (end of list) +>>> a@b in "*@a.domain"? no (end of list) +>>> a@b in "*@c.domain"? +>>> list element: *@c.domain +>>> b in "c.domain"? +>>> list element: c.domain +>>> b in "c.domain"? no (end of list) +>>> a@b in "*@c.domain"? no (end of list) +>>> someone@some.domain in "*@a.domain"? +>>> list element: *@a.domain +>>> some.domain in "a.domain"? +>>> list element: a.domain +>>> some.domain in "a.domain"? no (end of list) +>>> someone@some.domain in "*@a.domain"? no (end of list) +>>> someone@some.domain in "*@c.domain"? +>>> list element: *@c.domain +>>> some.domain in "c.domain"? +>>> 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 <= a@b H=(tester) [127.0.0.1] P=smtp S=sss diff --git a/test/stderr/0275 b/test/stderr/0275 index f59b6aac8..6e0b93366 100644 --- a/test/stderr/0275 +++ b/test/stderr/0275 @@ -205,15 +205,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 diff --git a/test/stderr/0278 b/test/stderr/0278 index c5b926186..6f80654b3 100644 --- a/test/stderr/0278 +++ b/test/stderr/0278 @@ -110,15 +110,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 diff --git a/test/stderr/0294 b/test/stderr/0294 index afffd2f51..2ec78fb58 100644 --- a/test/stderr/0294 +++ b/test/stderr/0294 @@ -33,9 +33,9 @@ SMTP>> 354 Enter message, ending with "." on a line by itself >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: -F From: x@y - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: x@y + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 @@ -65,9 +65,9 @@ SMTP>> 354 Enter message, ending with "." on a line by itself >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: -F From: x@y - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: x@y + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D Data file written for message 10HmaY-000000005vi-0000 diff --git a/test/stderr/0303 b/test/stderr/0303 index 6eb387a34..afd6bbbfa 100644 --- a/test/stderr/0303 +++ b/test/stderr/0303 @@ -108,8 +108,8 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: @@ -188,8 +188,8 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: diff --git a/test/stderr/0317 b/test/stderr/0317 index aaa9efce6..b736cd160 100644 --- a/test/stderr/0317 +++ b/test/stderr/0317 @@ -12,12 +12,12 @@ Cc: a@b.c Bcc: p@q.r >>Headers after rewriting and local additions: -T To: x@y.z -C Cc: a@b.c -* Bcc: p@q.r -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + T To: x@y.z + C Cc: a@b.c + * Bcc: p@q.r + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 @@ -50,15 +50,15 @@ Resent-cc: pp@qq.rr Resent-bcc: xx@yy.zz >>Headers after rewriting and local additions: - Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000 -I Resent-Message-Id: -T To: x@y.z -C Cc: a@b.c -B Bcc: p@q.r -T Resent-to: aa@bb.cc -C Resent-cc: pp@qq.rr -* Resent-bcc: xx@yy.zz -F Resent-From: CALLER_NAME + Resent-Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Resent-Message-Id: + T To: x@y.z + C Cc: a@b.c + B Bcc: p@q.r + T Resent-to: aa@bb.cc + C Resent-cc: pp@qq.rr + * Resent-bcc: xx@yy.zz + F Resent-From: CALLER_NAME Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D Data file written for message 10HmaY-000000005vi-0000 diff --git a/test/stderr/0361 b/test/stderr/0361 index 6ae3012bd..7a4f90d9a 100644 --- a/test/stderr/0361 +++ b/test/stderr/0361 @@ -26,15 +26,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D Data file written for message 10HmaY-000000005vi-0000 diff --git a/test/stderr/0371 b/test/stderr/0371 index 9105d6473..b57b68d8c 100644 --- a/test/stderr/0371 +++ b/test/stderr/0371 @@ -82,8 +82,8 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: diff --git a/test/stderr/0386 b/test/stderr/0386 index 40a9eb51b..ace0dc69c 100644 --- a/test/stderr/0386 +++ b/test/stderr/0386 @@ -254,8 +254,8 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: @@ -451,8 +451,8 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: diff --git a/test/stderr/0388 b/test/stderr/0388 index 546729f73..784cc3913 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -218,24 +218,24 @@ MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: Mail Delivery System rewrite_one_header: type=T: To: CALLER@myhost.test.ex search_tidyup called >>Headers after rewriting and local additions: - X-Failed-Recipients: x@y - Auto-Submitted: auto-replied -F From: Mail Delivery System -T To: CALLER@myhost.test.ex - References: - Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM - MIME-Version: 1.0 - Subject: Mail delivery failed: returning message to sender -I Message-Id: - Date: Tue, 2 Mar 1999 09:44:33 +0000 + X-Failed-Recipients: x@y + Auto-Submitted: auto-replied + F From: Mail Delivery System + T To: CALLER@myhost.test.ex + References: + Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM + MIME-Version: 1.0 + Subject: Mail delivery failed: returning message to sender + I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D Data file written for message 10HmaY-000000005vi-0000 diff --git a/test/stderr/0402 b/test/stderr/0402 index 8d6f16f95..2aa76c63d 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -30,15 +30,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 diff --git a/test/stderr/0403 b/test/stderr/0403 index ae0388347..83659eb67 100644 --- a/test/stderr/0403 +++ b/test/stderr/0403 @@ -19,15 +19,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 @@ -261,15 +261,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D Data file written for message 10HmaY-000000005vi-0000 diff --git a/test/stderr/0404 b/test/stderr/0404 index 774121b92..bf8a60e5d 100644 --- a/test/stderr/0404 +++ b/test/stderr/0404 @@ -53,8 +53,8 @@ Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, **** debug string too long - truncated **** qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=R: Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, @@ -92,7 +92,8 @@ rewrite headers From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, + R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, + sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, @@ -121,12 +122,11 @@ R Reply-to: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, - sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, - sender@test.ex, sender@test.ex, sender@ + sender@test.ex, sender@test.ex, sender **** debug string too long - truncated **** -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 @@ -277,8 +277,8 @@ References: Auto-Submitted: auto-replied qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=T: To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, **** debug string too long - truncated **** @@ -286,14 +286,14 @@ rewrite headers From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -T To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.e -**** debug string too long - truncated **** - In-Reply-To: - References: - Auto-Submitted: auto-replied -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + T To: sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test.ex, sender@test. + **** debug string too long - truncated **** + In-Reply-To: + References: + Auto-Submitted: auto-replied + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D Data file written for message 10HmaY-000000005vi-0000 diff --git a/test/stderr/0408 b/test/stderr/0408 index 7cbaefa0f..bbe75fb92 100644 --- a/test/stderr/0408 +++ b/test/stderr/0408 @@ -19,15 +19,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 diff --git a/test/stderr/0465 b/test/stderr/0465 index c4be802bb..76820b09d 100644 --- a/test/stderr/0465 +++ b/test/stderr/0465 @@ -69,15 +69,15 @@ search_tidyup called To: abc@domain. qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=T: To: abc@domain. search_tidyup called >>Headers after rewriting and local additions: -T To: abc@domain. -I Message-Id: - Date: Tue, 2 Mar 1999 09:44:33 +0000 + T To: abc@domain. + I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D Data file written for message 10HmaY-000000005vi-0000 @@ -143,15 +143,15 @@ search_tidyup called To: abc@xyz. qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=T: To: abc@xyz. search_tidyup called >>Headers after rewriting and local additions: -T To: abc@xyz. -I Message-Id: - Date: Tue, 2 Mar 1999 09:44:33 +0000 + T To: abc@xyz. + I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 diff --git a/test/stderr/0471 b/test/stderr/0471 index 9b214aa79..c1b27e63c 100644 --- a/test/stderr/0471 +++ b/test/stderr/0471 @@ -131,7 +131,7 @@ qualify & rewrite recipients list in TESTSUITE/aux-fixed/0471.rw creating new cache entry lookup failed -global rewrite rules +rewrite rules on sender address CALLER@myhost.test.ex in "^.{40,}@*"? list element: ^.{40,}@* address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* @@ -171,7 +171,7 @@ global rewrite rules in TESTSUITE/aux-fixed/0471.rw lookup failed rewritten sender = CALLER@myhost.test.ex -rewrite headers +qualify and rewrite headers rewrite_one_header: type=T: To: random@test.example, random@test.example, @@ -26701,9 +26701,8 @@ remainder: lookup failed search_tidyup called >>Headers after rewriting and local additions: -* To: random@test.example, - random@test.example, - random@test.example, + * To: random@test.example, + random@test.example, random@test.example, random@test.example, random@test.example, @@ -26781,8 +26780,11 @@ search_tidyup called random@test.example, random@test.example, random@test.example, + random@test.example **** debug string too long - truncated **** -T To: random@rwtest.example, + T To: random@rwtest.example, + random@rwtest.example, + random@rwtest.example, random@rwtest.example, random@rwtest.example, random@rwtest.example, @@ -26854,13 +26856,10 @@ T To: random@rwtest.example, random@rwtest.example, random@rwtest.example, random@rwtest.example, - random@rwtest.example, - random@rwtest.example, - **** debug string too long - truncated **** -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 @@ -26938,7 +26937,7 @@ qualify & rewrite recipients list in TESTSUITE/aux-fixed/0471.rw creating new cache entry lookup failed -global rewrite rules +rewrite rules on sender address CALLER@myhost.test.ex in "^.{40,}@*"? list element: ^.{40,}@* address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* @@ -26978,7 +26977,7 @@ global rewrite rules in TESTSUITE/aux-fixed/0471.rw lookup failed rewritten sender = CALLER@myhost.test.ex -rewrite headers +qualify and rewrite headers rewrite_one_header: type=T: To: localpart_with_056_chars_56789012345678901234567890123456@test.example localpart_with_056_chars_56789012345678901234567890123456@test.example in "^.{40,}@*"? @@ -27053,11 +27052,11 @@ remainder: lookup failed search_tidyup called >>Headers after rewriting and local additions: -* To: localpart_with_056_chars_56789012345678901234567890123456@test.example -T To: deny_me@rwtest.example -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + * To: localpart_with_056_chars_56789012345678901234567890123456@test.example + T To: deny_me@rwtest.example + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D Data file written for message 10HmaY-000000005vi-0000 @@ -27134,7 +27133,7 @@ qualify & rewrite recipients list in TESTSUITE/aux-fixed/0471.rw creating new cache entry lookup failed -global rewrite rules +rewrite rules on sender address CALLER@myhost.test.ex in "^.{40,}@*"? list element: ^.{40,}@* address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* @@ -27174,7 +27173,7 @@ global rewrite rules in TESTSUITE/aux-fixed/0471.rw lookup failed rewritten sender = CALLER@myhost.test.ex -rewrite headers +qualify and rewrite headers rewrite_one_header: type=T: To: localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example in "^.{40,}@*"? @@ -27249,11 +27248,11 @@ remainder: lookup failed search_tidyup called >>Headers after rewriting and local additions: -* To: localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example -T To: deny_me@rwtest.example -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + * To: localpart_with_236_chars_56789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example + T To: deny_me@rwtest.example + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-D Data file written for message 10HmaZ-000000005vi-0000 @@ -27330,7 +27329,7 @@ qualify & rewrite recipients list in TESTSUITE/aux-fixed/0471.rw creating new cache entry lookup failed -global rewrite rules +rewrite rules on sender address CALLER@myhost.test.ex in "^.{40,}@*"? list element: ^.{40,}@* address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* @@ -27370,7 +27369,7 @@ global rewrite rules in TESTSUITE/aux-fixed/0471.rw lookup failed rewritten sender = CALLER@myhost.test.ex -rewrite headers +qualify and rewrite headers rewrite_one_header: type=T: To: localpart_with_256_chars_5678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example LOG: MAIN @@ -27415,10 +27414,10 @@ LOG: MAIN lookup failed search_tidyup called >>Headers after rewriting and local additions: -T To: localpart_with_256_chars_5678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + T To: localpart_with_256_chars_5678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456@test.example + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmbA-000000005vi-0000-D Data file written for message 10HmbA-000000005vi-0000 @@ -27498,7 +27497,7 @@ qualify & rewrite recipients list in TESTSUITE/aux-fixed/0471.rw creating new cache entry lookup failed -global rewrite rules +rewrite rules on sender address CALLER@myhost.test.ex in "^.{40,}@*"? list element: ^.{40,}@* address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* @@ -27538,7 +27537,7 @@ global rewrite rules in TESTSUITE/aux-fixed/0471.rw lookup failed rewritten sender = CALLER@myhost.test.ex -rewrite headers +qualify and rewrite headers rewrite_one_header: type=T: To: undisclosed recpients:; rewrite_one_header: type=F: @@ -27581,10 +27580,10 @@ rewrite headers lookup failed search_tidyup called >>Headers after rewriting and local additions: -T To: undisclosed recpients:; -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + T To: undisclosed recpients:; + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmbB-000000005vi-0000-D Data file written for message 10HmbB-000000005vi-0000 @@ -27661,7 +27660,7 @@ qualify & rewrite recipients list in TESTSUITE/aux-fixed/0471.rw creating new cache entry lookup failed -global rewrite rules +rewrite rules on sender address CALLER@myhost.test.ex in "^.{40,}@*"? list element: ^.{40,}@* address match test: subject=CALLER@myhost.test.ex pattern=^.{40,}@* @@ -27701,7 +27700,7 @@ global rewrite rules in TESTSUITE/aux-fixed/0471.rw lookup failed rewritten sender = CALLER@myhost.test.ex -rewrite headers +qualify and rewrite headers rewrite_one_header: type=T: To: fred@ LOG: MAIN @@ -27746,10 +27745,10 @@ LOG: MAIN lookup failed search_tidyup called >>Headers after rewriting and local additions: -T To: fred@ -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + T To: fred@ + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmbC-000000005vi-0000-D Data file written for message 10HmbC-000000005vi-0000 diff --git a/test/stderr/0487 b/test/stderr/0487 index c28c3f34f..666933d1c 100644 --- a/test/stderr/0487 +++ b/test/stderr/0487 @@ -46,15 +46,15 @@ search_tidyup called From: unqualified qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: unqualified search_tidyup called >>Headers after rewriting and local additions: -F From: unqualified -I Message-Id: - Date: Tue, 2 Mar 1999 09:44:33 +0000 + F From: unqualified + I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 diff --git a/test/stderr/0489 b/test/stderr/0489 index 1e328e28b..1c20a8b4b 100644 --- a/test/stderr/0489 +++ b/test/stderr/0489 @@ -12,9 +12,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: -F From: "Phil Q. Hazel" - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: "Phil Q. Hazel" + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 @@ -45,9 +45,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: -F From: John "Jack" Smith - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: John "Jack" Smith + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D Data file written for message 10HmaY-000000005vi-0000 @@ -77,9 +77,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: -F From: John "Jack" "Q." Smith - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: John "Jack" "Q." Smith + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-D Data file written for message 10HmaZ-000000005vi-0000 @@ -109,9 +109,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: -F From: "John (Jack) Q. Smith" - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: "John (Jack) Q. Smith" + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmbA-000000005vi-0000-D Data file written for message 10HmbA-000000005vi-0000 @@ -141,9 +141,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: -F From: John ("Jack") "Q." Smith - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: John ("Jack") "Q." Smith + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmbB-000000005vi-0000-D Data file written for message 10HmbB-000000005vi-0000 @@ -173,9 +173,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: -F From: "John (\"Jack\") Q. Smith" - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: "John (\"Jack\") Q. Smith" + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmbC-000000005vi-0000-D Data file written for message 10HmbC-000000005vi-0000 @@ -205,9 +205,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: -F From: "Phil \"Q Hazel" - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: "Phil \"Q Hazel" + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmbD-000000005vi-0000-D Data file written for message 10HmbD-000000005vi-0000 @@ -237,9 +237,9 @@ Recipients: >>Headers received: >>Headers after rewriting and local additions: -I Message-Id: -F From: "Phil \"Q" "X." Hazel - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: "Phil \"Q" "X." Hazel + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmbE-000000005vi-0000-D Data file written for message 10HmbE-000000005vi-0000 diff --git a/test/stderr/0575 b/test/stderr/0575 index 3c7534e44..c1bc66ab6 100644 --- a/test/stderr/0575 +++ b/test/stderr/0575 @@ -46,8 +46,8 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers search_tidyup called >>Headers after rewriting and local additions: diff --git a/test/stderr/2600 b/test/stderr/2600 index 72291ff43..a81e20da0 100644 --- a/test/stderr/2600 +++ b/test/stderr/2600 @@ -529,15 +529,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 diff --git a/test/stderr/2610 b/test/stderr/2610 index 5bbc3c165..6fedeb321 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -483,15 +483,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 diff --git a/test/stderr/2620 b/test/stderr/2620 index f1e7438cf..bafb175df 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -649,15 +649,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 diff --git a/test/stderr/5004 b/test/stderr/5004 index d92e7a7d2..dd3ddcf1f 100644 --- a/test/stderr/5004 +++ b/test/stderr/5004 @@ -21,15 +21,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 diff --git a/test/stderr/5005 b/test/stderr/5005 index b9512666c..d9041e69f 100644 --- a/test/stderr/5005 +++ b/test/stderr/5005 @@ -19,15 +19,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 @@ -210,15 +210,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D Data file written for message 10HmaY-000000005vi-0000 @@ -402,15 +402,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaZ-000000005vi-0000-D Data file written for message 10HmaZ-000000005vi-0000 @@ -604,15 +604,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmbA-000000005vi-0000-D Data file written for message 10HmbA-000000005vi-0000 diff --git a/test/stderr/5006 b/test/stderr/5006 index 25a76f693..864a726f5 100644 --- a/test/stderr/5006 +++ b/test/stderr/5006 @@ -19,15 +19,15 @@ search_tidyup called >>Headers received: qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and rewrite headers rewrite_one_header: type=F: From: CALLER_NAME search_tidyup called >>Headers after rewriting and local additions: -I Message-Id: -F From: CALLER_NAME - Date: Tue, 2 Mar 1999 09:44:33 +0000 + I Message-Id: + F From: CALLER_NAME + Date: Tue, 2 Mar 1999 09:44:33 +0000 Data file name: TESTSUITE/spool//input//10HmaX-000000005vi-0000-D Data file written for message 10HmaX-000000005vi-0000 diff --git a/test/stdout/0249 b/test/stdout/0249 index 68d431533..054d0892a 100644 --- a/test/stdout/0249 +++ b/test/stdout/0249 @@ -14,3 +14,18 @@ env-from: User@b.domain reply-to: User@d.domain env-from: User@d.domain env-to: User@d.domain + +**** SMTP testing session as if from host 127.0.0.1 +**** but without any ident (RFC 1413) callback. +**** This is not for real! + +220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 +250 myhost.test.ex Hello tester [127.0.0.1] +250 OK +250 Accepted +354 Enter message, ending with "." on a line by itself +250 OK id=10HmaX-000000005vi-0000 + +**** SMTP testing: that is not a real message id! + +221 myhost.test.ex closing connection -- 2.30.2